Merge pull request rust-lang#18980 from lnicola/sync-from-rust

lnicola · web-flow · commit 7b65774098c2 · 2025-01-20T09:29:00.000Z
minor: Sync from downstream
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -87,11 +87,11 @@ vfs-notify = { path = "./crates/vfs-notify", version = "0.0.0" }
 vfs = { path = "./crates/vfs", version = "0.0.0" }
 edition = { path = "./crates/edition", version = "0.0.0" }
 
-ra-ap-rustc_lexer = { version = "0.87", default-features = false }
-ra-ap-rustc_parse_format = { version = "0.87", default-features = false }
-ra-ap-rustc_index = { version = "0.87", default-features = false }
-ra-ap-rustc_abi = { version = "0.87", default-features = false }
-ra-ap-rustc_pattern_analysis = { version = "0.87", default-features = false }
+ra-ap-rustc_lexer = { version = "0.91", default-features = false }
+ra-ap-rustc_parse_format = { version = "0.91", default-features = false }
+ra-ap-rustc_index = { version = "0.91", default-features = false }
+ra-ap-rustc_abi = { version = "0.91", default-features = false }
+ra-ap-rustc_pattern_analysis = { version = "0.91", default-features = false }
 
 # local crates that aren't published to crates.io. These should not have versions.
 
diff --git a/crates/hir-ty/src/layout.rs b/crates/hir-ty/src/layout.rs
@@ -197,6 +197,7 @@ fn layout_of_simd_ty(
         align,
         max_repr_align: None,
         unadjusted_abi_align: align.abi,
+        randomization_seed: 0,
     }))
 }
 
@@ -313,6 +314,7 @@ pub fn layout_of_ty_query(
                 size,
                 max_repr_align: None,
                 unadjusted_abi_align: element.align.abi,
+                randomization_seed: 0,
             }
         }
         TyKind::Slice(element) => {
@@ -326,6 +328,7 @@ pub fn layout_of_ty_query(
                 size: Size::ZERO,
                 max_repr_align: None,
                 unadjusted_abi_align: element.align.abi,
+                randomization_seed: 0,
             }
         }
         TyKind::Str => Layout {
@@ -337,6 +340,7 @@ pub fn layout_of_ty_query(
             size: Size::ZERO,
             max_repr_align: None,
             unadjusted_abi_align: dl.i8_align.abi,
+            randomization_seed: 0,
         },
         // Potentially-wide pointers.
         TyKind::Ref(_, _, pointee) | TyKind::Raw(_, pointee) => {
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-fb546ee09b226bc4dd4b712d35a372d923c4fa54
+9a1d156f38c51441ee51e5a068f1d0caf4bb0f27

Original file line number	Diff line number	Diff line change
`@@ -197,6 +197,7 @@ fn layout_of_simd_ty(`
`197`	`197`	`align,`
`198`	`198`	`max_repr_align: None,`
`199`	`199`	`unadjusted_abi_align: align.abi,`
	`200`	`+ randomization_seed: 0,`
`200`	`201`	`}))`
`201`	`202`	`}`
`202`	`203`
`@@ -313,6 +314,7 @@ pub fn layout_of_ty_query(`
`313`	`314`	`size,`
`314`	`315`	`max_repr_align: None,`
`315`	`316`	`unadjusted_abi_align: element.align.abi,`
	`317`	`+ randomization_seed: 0,`
`316`	`318`	`}`
`317`	`319`	`}`
`318`	`320`	`TyKind::Slice(element) => {`
`@@ -326,6 +328,7 @@ pub fn layout_of_ty_query(`
`326`	`328`	`size: Size::ZERO,`
`327`	`329`	`max_repr_align: None,`
`328`	`330`	`unadjusted_abi_align: element.align.abi,`
	`331`	`+ randomization_seed: 0,`
`329`	`332`	`}`
`330`	`333`	`}`
`331`	`334`	`TyKind::Str => Layout {`
`@@ -337,6 +340,7 @@ pub fn layout_of_ty_query(`
`337`	`340`	`size: Size::ZERO,`
`338`	`341`	`max_repr_align: None,`
`339`	`342`	`unadjusted_abi_align: dl.i8_align.abi,`
	`343`	`+ randomization_seed: 0,`
`340`	`344`	`},`
`341`	`345`	`// Potentially-wide pointers.`
`342`	`346`	`TyKind::Ref(_, _, pointee) \| TyKind::Raw(_, pointee) => {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-fb546ee09b226bc4dd4b712d35a372d923c4fa54`
	`1`	`+9a1d156f38c51441ee51e5a068f1d0caf4bb0f27`