Merge pull request #151 from nikomatsakis/publish-formality-core

nikomatsakis · web-flow · commit 320a42f60319 · 2023-11-02T05:21:24.000-04:00
Publish formality core
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,12 @@
 [package]
-name = "formality"
+name = "a-mir-formality"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
+description = "Model of the Rust type system maintained by the Rust types team (in development)"
+homepage = "https://rust-lang.github.io/a-mir-formality/"
+repository = "https://github.com/rust-lang/a-mir-formality/"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
diff --git a/crates/formality-core/Cargo.toml b/crates/formality-core/Cargo.toml
@@ -1,18 +1,23 @@
 [package]
 name = "formality-core"
-version = "0.1.0"
+version = "0.1.1"
 edition = "2021"
+license = "MIT OR Apache-2.0"
+description = "Language-independent formality system used by a-mir-formality"
+homepage = "https://rust-lang.github.io/a-mir-formality/"
+repository = "https://github.com/rust-lang/a-mir-formality/"
+readme = "README.md"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 lazy_static = "1.4.0"
-env_logger = "*"
+env_logger = "0.10.0"
 stacker = "0.1.15"
 tracing = "0.1"
 tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]}
 tracing-tree = { version = "0.2" }
-formality-macros = { path = "../formality-macros" }
+formality-macros = { version = "0.1.0", path = "../formality-macros" }
 anyhow = "1.0.75"
 contracts = "0.6.3"
 
diff --git a/crates/formality-core/README.md b/crates/formality-core/README.md
@@ -0,0 +1,4 @@
+# formality-core
+
+`formality_core` is the language independent part of a-mir-formality.
+It can be reused by other projects looking to model formal semantics of languages besides Rust.
diff --git a/crates/formality-macros/Cargo.toml b/crates/formality-macros/Cargo.toml
@@ -2,6 +2,10 @@
 name = "formality-macros"
 version = "0.1.0"
 edition = "2021"
+license = "MIT OR Apache-2.0"
+description = "Macros used by a-mir-formality and formality-core"
+homepage = "https://rust-lang.github.io/a-mir-formality/"
+repository = "https://github.com/rust-lang/a-mir-formality/"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -11,8 +15,8 @@ proc-macro = true
 [dependencies]
 quote = "1.0.21"
 proc-macro2 = "1.0"
-syn = "1.0.102"
-synstructure = "0.12.6"
+syn = { version = "2.0", features = ["full"] }
+synstructure = "0.13.0"
 tracing = "0.1"
 convert_case = "0.6.0"
 
diff --git a/crates/formality-macros/READE.md b/crates/formality-macros/READE.md
@@ -0,0 +1,5 @@
+# formality-macros
+
+Procedural macros used by the formality system.
+Don't import this crate directly.
+Check out formality-core instead.
diff --git a/crates/formality-macros/src/cast.rs b/crates/formality-macros/src/cast.rs
@@ -91,5 +91,5 @@ fn downcast_to_variant(s: &synstructure::Structure, v: &VariantInfo) -> TokenStr
 }
 
 pub(crate) fn has_cast_attr(attrs: &[Attribute]) -> bool {
-    attrs.iter().any(|a| a.path.is_ident("cast"))
+    attrs.iter().any(|a| a.path().is_ident("cast"))
 }
diff --git a/crates/formality-macros/src/debug.rs b/crates/formality-macros/src/debug.rs
@@ -237,7 +237,7 @@ fn debug_variant_with_attr(
 }
 
 fn get_grammar_attr(attrs: &[Attribute]) -> Option<syn::Result<FormalitySpec>> {
-    let attr = attrs.iter().find(|a| a.path.is_ident("grammar"))?;
+    let attr = attrs.iter().find(|a| a.path().is_ident("grammar"))?;
     Some(attr.parse_args())
 }
 
diff --git a/crates/formality-macros/src/parse.rs b/crates/formality-macros/src/parse.rs
@@ -206,7 +206,7 @@ fn lookahead(for_field: &Ident, op: Option<&FormalitySpecOp>) -> syn::Result<Lit
 }
 
 fn get_grammar_attr(attrs: &[Attribute]) -> Option<syn::Result<FormalitySpec>> {
-    let attr = attrs.iter().find(|a| a.path.is_ident("grammar"))?;
+    let attr = attrs.iter().find(|a| a.path().is_ident("grammar"))?;
     Some(attr.parse_args())
 }
 
diff --git a/crates/formality-macros/src/term.rs b/crates/formality-macros/src/term.rs
@@ -40,7 +40,7 @@ fn remove_formality_attributes(input: &mut DeriveInput) {
         for variant in &mut v.variants {
             variant
                 .attrs
-                .retain(|attr| !attr.path.is_ident("grammar") && !attr.path.is_ident("cast"));
+                .retain(|attr| !attr.path().is_ident("grammar") && !attr.path().is_ident("cast"));
         }
     }
 }
diff --git a/src/main.rs b/src/main.rs
@@ -1,3 +1,3 @@
 fn main() -> anyhow::Result<()> {
-    formality_core::with_tracing_logs(formality::main)
+    formality_core::with_tracing_logs(a_mir_formality::main)
 }
diff --git a/tests/associated_type_normalization.rs b/tests/associated_type_normalization.rs
@@ -1,4 +1,4 @@
-use formality::test_where_clause;
+use a_mir_formality::test_where_clause;
 
 const MIRROR: &str = "[
     crate core {
diff --git a/tests/coherence_overlap.rs b/tests/coherence_overlap.rs
@@ -1,6 +1,6 @@
 #![allow(non_snake_case)] // we embed type names into the names for our test functions
 
-use formality::test_program_ok;
+use a_mir_formality::test_program_ok;
 use formality_macros::test;
 
 #[test]
diff --git a/tests/projection.rs b/tests/projection.rs
@@ -1,4 +1,4 @@
-use formality::test_where_clause;
+use a_mir_formality::test_where_clause;
 
 const NORMALIZE_BASIC: &str = "[
     crate test {
@@ -260,7 +260,6 @@ const PROJECTION_EQUALITY: &str = "[
     }
 ]";
 
-
 #[test]
 fn projection_equality() {
     expect_test::expect![[r#"
diff --git a/tests/ui.rs b/tests/ui.rs
@@ -6,7 +6,7 @@ fn main() -> Result<()> {
     let mut config = Config::rustc("tests/ui");
     // Prevent ui_test from trying to query `formality` for the host platform name
     config.host = Some("non of ya bizniz".into());
-    config.program.program = "target/debug/formality".into();
+    config.program.program = "target/debug/a-mir-formality".into();
     config.mode = Mode::Fail {
         require_patterns: false,
     };

Original file line number	Diff line number	Diff line change
`@@ -91,5 +91,5 @@ fn downcast_to_variant(s: &synstructure::Structure, v: &VariantInfo) -> TokenStr`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`pub(crate) fn has_cast_attr(attrs: &[Attribute]) -> bool {`
`94`		`- attrs.iter().any(\|a\| a.path.is_ident("cast"))`
	`94`	`+ attrs.iter().any(\|a\| a.path().is_ident("cast"))`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ fn debug_variant_with_attr(`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`fn get_grammar_attr(attrs: &[Attribute]) -> Option<syn::Result<FormalitySpec>> {`
`240`		`- let attr = attrs.iter().find(\|a\| a.path.is_ident("grammar"))?;`
	`240`	`+ let attr = attrs.iter().find(\|a\| a.path().is_ident("grammar"))?;`
`241`	`241`	`Some(attr.parse_args())`
`242`	`242`	`}`
`243`	`243`
Original file line number	Diff line number	Diff line change
`@@ -206,7 +206,7 @@ fn lookahead(for_field: &Ident, op: Option<&FormalitySpecOp>) -> syn::Result<Lit`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`fn get_grammar_attr(attrs: &[Attribute]) -> Option<syn::Result<FormalitySpec>> {`
`209`		`- let attr = attrs.iter().find(\|a\| a.path.is_ident("grammar"))?;`
	`209`	`+ let attr = attrs.iter().find(\|a\| a.path().is_ident("grammar"))?;`
`210`	`210`	`Some(attr.parse_args())`
`211`	`211`	`}`
`212`	`212`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ fn remove_formality_attributes(input: &mut DeriveInput) {`
`40`	`40`	`for variant in &mut v.variants {`
`41`	`41`	`variant`
`42`	`42`	`.attrs`
`43`		`- .retain(\|attr\| !attr.path.is_ident("grammar") && !attr.path.is_ident("cast"));`
	`43`	`+ .retain(\|attr\| !attr.path().is_ident("grammar") && !attr.path().is_ident("cast"));`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`