Skip to content

Commit

Permalink
Auto merge of #15849 - HKalbasi:fix-sync, r=HKalbasi
Browse files Browse the repository at this point in the history
Update rustc dependencies

Except `rustc_parse_format` that was broken by upstream.
  • Loading branch information
bors committed Nov 7, 2023
2 parents 2a48432 + 1086b29 commit 3b7c7f9
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 11 deletions.
34 changes: 27 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/hir-def/src/data/adt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ fn parse_repr_tt(tt: &Subtree) -> Option<ReprOptions> {
}
}

Some(ReprOptions { int, align: max_align, pack: min_pack, flags })
Some(ReprOptions { int, align: max_align, pack: min_pack, flags, field_shuffle_seed: 0 })
}

impl StructData {
Expand Down
6 changes: 3 additions & 3 deletions crates/rustc-dependencies/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ authors.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
ra-ap-rustc_lexer = { version = "0.14.0" }
ra-ap-rustc_lexer = { version = "0.18.0" }
ra-ap-rustc_parse_format = { version = "0.14.0", default-features = false }
ra-ap-rustc_index = { version = "0.14.0", default-features = false }
ra-ap-rustc_abi = { version = "0.14.0", default-features = false }
ra-ap-rustc_index = { version = "0.18.0", default-features = false }
ra-ap-rustc_abi = { version = "0.18.0", default-features = false }

[features]
in-rust-tree = []

0 comments on commit 3b7c7f9

Please sign in to comment.