diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-12-21 22:16:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-21 22:16:03 +0100 |
| commit | e461a3f6b9806f5a59bf2e785a20e53a6d4a974e (patch) | |
| tree | a667f92e125d165e330251aa115eb26daa6246d2 | |
| parent | 3aedae24a25ac29960a35709712e45034dff87df (diff) | |
| parent | e151148a725fc65410ad72d88f7d720ea33c25f1 (diff) | |
| download | rust-e461a3f6b9806f5a59bf2e785a20e53a6d4a974e.tar.gz rust-e461a3f6b9806f5a59bf2e785a20e53a6d4a974e.zip | |
Rollup merge of #134526 - onur-ozkan:nightly-feat-rustc, r=jieyouxu
update `rustc_index_macros` feature handling It seems that cargo can't [conditionally propagate features](https://github.com/rust-lang/rust/blob/214587c89d527dd0ccbe1f2150c737d3bdee67b0/compiler/rustc_index/Cargo.toml#L20) if they were enabled by default on the target crate, but disabled with `default-features = false` in the current/parent crate. Fixes #118129
| -rw-r--r-- | compiler/rustc_index/Cargo.toml | 2 | ||||
| -rw-r--r-- | compiler/rustc_index_macros/Cargo.toml | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_index/Cargo.toml b/compiler/rustc_index/Cargo.toml index 33e8e2824c7..f27db7a5400 100644 --- a/compiler/rustc_index/Cargo.toml +++ b/compiler/rustc_index/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] # tidy-alphabetical-start -rustc_index_macros = { path = "../rustc_index_macros", default-features = false } +rustc_index_macros = { path = "../rustc_index_macros" } rustc_macros = { path = "../rustc_macros", optional = true } rustc_serialize = { path = "../rustc_serialize", optional = true } smallvec = "1.8.1" diff --git a/compiler/rustc_index_macros/Cargo.toml b/compiler/rustc_index_macros/Cargo.toml index a7c2a1804dd..98bc1b6a29b 100644 --- a/compiler/rustc_index_macros/Cargo.toml +++ b/compiler/rustc_index_macros/Cargo.toml @@ -12,5 +12,4 @@ proc-macro2 = "1" quote = "1" [features] -default = ["nightly"] nightly = [] |