Skip to content

Commit 2c9b0de

Browse files
committed
Auto merge of rust-lang#116269 - Veykril:rustc-abi, r=WaffleLapkin
Bring back generic parameters for indices in rustc_abi and make it compile on stable This effectively reverses rust-lang#107163, allowing rust-analyzer to depend on this crate again, It also moves some glob imports / expands them in the first commit because they made it more difficult for me to reason about things.
2 parents cae0791 + 0aedec4 commit 2c9b0de

File tree

9 files changed

+295
-232
lines changed

9 files changed

+295
-232
lines changed

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4473,6 +4473,7 @@ dependencies = [
44734473
"rustc_data_structures",
44744474
"rustc_feature",
44754475
"rustc_fs_util",
4476+
"rustc_index",
44764477
"rustc_macros",
44774478
"rustc_serialize",
44784479
"rustc_span",

compiler/rustc_abi/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ rustc_serialize = { path = "../rustc_serialize", optional = true }
1515

1616
[features]
1717
default = ["nightly", "randomize"]
18-
randomize = ["rand", "rand_xoshiro"]
18+
randomize = ["rand", "rand_xoshiro", "nightly"]
19+
# rust-analyzer depends on this crate and we therefore require it to built on a stable toolchain
20+
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
1921
nightly = [
2022
"rustc_data_structures",
2123
"rustc_index/nightly",

compiler/rustc_abi/src/layout.rs

+134-98
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)