diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2023-12-15 15:57:27 +0100 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2023-12-21 17:23:36 +0100 |
| commit | 96051bc0d8b0985769f1f7581052b342a04602f7 (patch) | |
| tree | c093ae0335a7ea750aef38d23acc01020b75072f | |
| parent | 874df3bffa76a22e92840eb60aa4018c7152512e (diff) | |
Fix workspace layout
| -rw-r--r-- | .github/workflows/ci.yaml | 1 | ||||
| -rw-r--r-- | crates/proc-macro-srv/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/Cargo.toml | 3 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml | 7 | ||||
| -rw-r--r-- | crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1f2a7796d11..be830415f9c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -38,7 +38,6 @@ jobs: - 'crates/proc-macro-api/**' - 'crates/proc-macro-srv/**' - 'crates/proc-macro-srv-cli/**' - - 'crates/proc-macro-test/**' rust: needs: changes diff --git a/crates/proc-macro-srv/Cargo.toml b/crates/proc-macro-srv/Cargo.toml index 04d92b5b77a..bef2c30e9fb 100644 --- a/crates/proc-macro-srv/Cargo.toml +++ b/crates/proc-macro-srv/Cargo.toml @@ -37,4 +37,4 @@ expect-test = "1.4.0" proc-macro-test.path = "./proc-macro-test" [features] -sysroot-abi = [] +sysroot-abi = ["proc-macro-test/sysroot-abi"] diff --git a/crates/proc-macro-srv/proc-macro-test/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/Cargo.toml index f91c1e7e04e..ea8a01b00c7 100644 --- a/crates/proc-macro-srv/proc-macro-test/Cargo.toml +++ b/crates/proc-macro-srv/proc-macro-test/Cargo.toml @@ -16,3 +16,6 @@ proc-macro-test-impl = { path = "imp", version = "0.0.0" } # local deps toolchain.path = "../../toolchain" + +[features] +sysroot-abi = ["proc-macro-test-impl/sysroot-abi"] diff --git a/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml b/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml index 2a36737cef0..dc94fcd61a4 100644 --- a/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml +++ b/crates/proc-macro-srv/proc-macro-test/imp/Cargo.toml @@ -9,8 +9,11 @@ publish = false doctest = false proc-macro = true -[workspace] - [dependencies] # this crate should not have any dependencies, since it uses its own workspace, # and its own `Cargo.lock` + +[features] +sysroot-abi = [] + +[workspace] diff --git a/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs index d9018b1b87d..03241b16be6 100644 --- a/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs +++ b/crates/proc-macro-srv/proc-macro-test/imp/src/lib.rs @@ -1,5 +1,6 @@ //! Exports a few trivial procedural macros for testing. +#![cfg(any(feature = "sysroot-abi", rust_analyzer))] #![warn(rust_2018_idioms, unused_lifetimes)] #![feature(proc_macro_span, proc_macro_def_site)] |