Skip to content

Commit 3b7c7f9

Browse files
committed
Auto merge of rust-lang#15849 - HKalbasi:fix-sync, r=HKalbasi
Update rustc dependencies Except `rustc_parse_format` that was broken by upstream.
2 parents 2a48432 + 1086b29 commit 3b7c7f9

File tree

3 files changed

+31
-11
lines changed

3 files changed

+31
-11
lines changed

Cargo.lock

+27-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir-def/src/data/adt.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ fn parse_repr_tt(tt: &Subtree) -> Option<ReprOptions> {
178178
}
179179
}
180180

181-
Some(ReprOptions { int, align: max_align, pack: min_pack, flags })
181+
Some(ReprOptions { int, align: max_align, pack: min_pack, flags, field_shuffle_seed: 0 })
182182
}
183183

184184
impl StructData {

crates/rustc-dependencies/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ authors.workspace = true
1111
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1212

1313
[dependencies]
14-
ra-ap-rustc_lexer = { version = "0.14.0" }
14+
ra-ap-rustc_lexer = { version = "0.18.0" }
1515
ra-ap-rustc_parse_format = { version = "0.14.0", default-features = false }
16-
ra-ap-rustc_index = { version = "0.14.0", default-features = false }
17-
ra-ap-rustc_abi = { version = "0.14.0", default-features = false }
16+
ra-ap-rustc_index = { version = "0.18.0", default-features = false }
17+
ra-ap-rustc_abi = { version = "0.18.0", default-features = false }
1818

1919
[features]
2020
in-rust-tree = []

0 commit comments

Comments
 (0)