diff options
| -rw-r--r-- | Cargo.toml | 3 | ||||
| -rw-r--r-- | crates/proc-macro-srv/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/Cargo.toml (renamed from crates/proc-macro-test/Cargo.toml) | 10 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/build.rs (renamed from crates/proc-macro-test/build.rs) | 0 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/imp/.gitignore (renamed from crates/proc-macro-test/imp/.gitignore) | 0 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml (renamed from crates/proc-macro-test/imp/Cargo.toml) | 0 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs (renamed from crates/proc-macro-test/imp/src/lib.rs) | 0 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/src/lib.rs (renamed from crates/proc-macro-test/src/lib.rs) | 0 |
8 files changed, 6 insertions, 9 deletions
diff --git a/Cargo.toml b/Cargo.toml index 556d159ab7d..d4cff420bcb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = ["xtask/", "lib/*", "crates/*"] -exclude = ["crates/proc-macro-test/imp"] +exclude = ["crates/proc-macro-srv/proc-macro-test/"] resolver = "2" [workspace.package] @@ -81,7 +81,6 @@ vfs = { path = "./crates/vfs", version = "0.0.0" } rustc-dependencies = { path = "./crates/rustc-dependencies", version = "0.0.0" } # local crates that aren't published to crates.io. These should not have versions. -proc-macro-test = { path = "./crates/proc-macro-test" } sourcegen = { path = "./crates/sourcegen" } test-fixture = { path = "./crates/test-fixture" } test-utils = { path = "./crates/test-utils" } diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index 3bcc6e12cb1..04d92b5b77a 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -34,7 +34,7 @@ proc-macro-api.workspace = true expect-test = "1.4.0" # used as proc macro test targets -proc-macro-test.workspace = true +proc-macro-test.path = "./proc-macro-test" [features] sysroot-abi = [] diff --git a/crates/proc-macro-test/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/Cargo.toml index 12d7c07d3ed..f91c1e7e04e 100644 --- a/crates/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-srv/proc-macro-test/Cargo.toml @@ -3,18 +3,16 @@ name = "proc-macro-test" version = "0.0.0" publish = false -authors.workspace = true -edition.workspace = true -license.workspace = true -rust-version.workspace = true +edition = "2021" +license = "MIT OR Apache-2.0" [lib] doctest = false [build-dependencies] -cargo_metadata.workspace = true +cargo_metadata = "0.18.1" proc-macro-test-impl = { path = "imp", version = "0.0.0" } # local deps -toolchain.workspace = true +toolchain.path = "../../toolchain" diff --git a/crates/proc-macro-test/build.rs b/crates/proc-macro-srv/proc-macro-test/build.rs index 7827157865a..7827157865a 100644 --- a/crates/proc-macro-test/build.rs +++ b/crates/proc-macro-srv/proc-macro-test/build.rs diff --git a/crates/proc-macro-test/imp/.gitignore b/crates/proc-macro-srv/proc-macro-test/imp/.gitignore index 2c96eb1b651..2c96eb1b651 100644 --- a/crates/proc-macro-test/imp/.gitignore +++ b/crates/proc-macro-srv/proc-macro-test/imp/.gitignore diff --git a/crates/proc-macro-test/imp/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml index 2a36737cef0..2a36737cef0 100644 --- a/crates/proc-macro-test/imp/Cargo.toml +++ b/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml diff --git a/crates/proc-macro-test/imp/src/lib.rs b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs index d9018b1b87d..d9018b1b87d 100644 --- a/crates/proc-macro-test/imp/src/lib.rs +++ b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs diff --git a/crates/proc-macro-test/src/lib.rs b/crates/proc-macro-srv/proc-macro-test/src/lib.rs index 739c6ec6f44..739c6ec6f44 100644 --- a/crates/proc-macro-test/src/lib.rs +++ b/crates/proc-macro-srv/proc-macro-test/src/lib.rs |