Skip to content

Commit

Permalink
Patches - Fix incorrect line numbers in patches
Browse files Browse the repository at this point in the history
  • Loading branch information
thepowersgang committed Dec 16, 2024
1 parent 07a942a commit 012bc63
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions rustc-1.74.0-src.patch
Original file line number Diff line number Diff line change
Expand Up @@ -81,14 +81,14 @@
mod size_asserts {
--- compiler/rustc_middle/src/mir/consts.rs
+++ compiler/rustc_middle/src/mir/consts.rs
@@ -73,3 +73,3 @@
@@ -72,3 +73,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
static_assert_size!(ConstValue<'_>, 24);
--- compiler/rustc_middle/src/mir/interpret/value.rs
+++ compiler/rustc_middle/src/mir/interpret/value.rs
@@ -37,3 +37,3 @@
@@ -36,3 +37,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
Expand All @@ -109,7 +109,7 @@
mod size_asserts {
--- compiler/rustc_middle/src/ty/consts/kind.rs
+++ compiler/rustc_middle/src/ty/consts/kind.rs
@@ -75,3 +75,3 @@
@@ -74,3 +75,3 @@

-#[cfg(all(target_arch = "x86_64", target_pointer_width = "64"))]
+#[cfg(all(target_arch = "x86_64", target_pointer_width = "64", not(rust_compiler = "mrustc")))]
Expand All @@ -118,7 +118,7 @@
# MSVC Cannot handle structs larger than 32-bit, so disable this for windows with mrustc
--- vendor/hex/src/lib.rs
+++ vendor/hex/src/lib.rs
@@ -239,3 +239,3 @@
@@ -238,3 +239,3 @@

-#[cfg(target_pointer_width = "64")]
+#[cfg(all(target_pointer_width = "64", not(rust_compiler = "mrustc")))]
Expand Down

0 comments on commit 012bc63

Please sign in to comment.