Auto merge of rust-lang#15849 - HKalbasi:fix-sync, r=HKalbasi

Update rustc dependencies Except `rustc_parse_format` that was broken by upstream.
rust-lang-ci · Nov 7, 2023 · 3b7c7f9 · 3b7c7f9
2 parents 2a48432 + 1086b29
commit 3b7c7f9
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hir-def/src/data/adt.rs b/crates/hir-def/src/data/adt.rs
@@ -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 {

diff --git a/crates/rustc-dependencies/Cargo.toml b/crates/rustc-dependencies/Cargo.toml
@@ -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 = []
-Original file 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 @@