Skip to content

Commit

Permalink
Auto merge of #116269 - Veykril:rustc-abi, r=WaffleLapkin
Browse files Browse the repository at this point in the history
Bring back generic parameters for indices in rustc_abi and make it compile on stable

This effectively reverses #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.
  • Loading branch information
bors committed Oct 6, 2023
2 parents cae0791 + 0aedec4 commit 2c9b0de
Show file tree
Hide file tree
Showing 9 changed files with 295 additions and 232 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4473,6 +4473,7 @@ dependencies = [
"rustc_data_structures",
"rustc_feature",
"rustc_fs_util",
"rustc_index",
"rustc_macros",
"rustc_serialize",
"rustc_span",
Expand Down
4 changes: 3 additions & 1 deletion compiler/rustc_abi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ rustc_serialize = { path = "../rustc_serialize", optional = true }

[features]
default = ["nightly", "randomize"]
randomize = ["rand", "rand_xoshiro"]
randomize = ["rand", "rand_xoshiro", "nightly"]
# rust-analyzer depends on this crate and we therefore require it to built on a stable toolchain
# without depending on rustc_data_structures, rustc_macros and rustc_serialize
nightly = [
"rustc_data_structures",
"rustc_index/nightly",
Expand Down
232 changes: 134 additions & 98 deletions compiler/rustc_abi/src/layout.rs

Large diffs are not rendered by default.

Loading

0 comments on commit 2c9b0de

Please sign in to comment.