Skip to content

Commit

Permalink
Unrolled build for rust-lang#134526
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#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 rust-lang#118129
  • Loading branch information
rust-timer authored Dec 22, 2024
2 parents 426d173 + e151148 commit 8ea555d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion compiler/rustc_index/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion compiler/rustc_index_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ proc-macro2 = "1"
quote = "1"

[features]
default = ["nightly"]
nightly = []

0 comments on commit 8ea555d

Please sign in to comment.