Auto merge of rust-lang#2169 - RalfJung:rustup, r=RalfJung

Rustup Cc rust-lang#97563
rust-lang-ci · May 30, 2022 · 10cb09c · 10cb09c
2 parents 9d418a3 + 7fb5110
commit 10cb09c
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0f06824013761ed6829887019033f1001e68f623
+c35035cefc709abddabfb28ecc6a326458d46ce2
diff --git a/tests/compile-fail/generator-pinned-moved.rs b/tests/compile-fail/generator-pinned-moved.rs
@@ -1,3 +1,4 @@
+// compile-flags: -Zmiri-disable-validation
 #![feature(generators, generator_trait)]
 
 use std::{

diff --git a/tests/compile-fail/generator-pinned-moved.stderr b/tests/compile-fail/generator-pinned-moved.stderr
@@ -8,12 +8,12 @@ LL |         *num += 1;
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
 
    = note: inside closure at $DIR/generator-pinned-moved.rs:LL:CC
-note: inside `<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC: 15:6]> as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC
+note: inside `<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC]> as std::iter::Iterator>::next` at $DIR/generator-pinned-moved.rs:LL:CC
   --> $DIR/generator-pinned-moved.rs:LL:CC
    |
 LL |         match me.resume(()) {
    |               ^^^^^^^^^^^^^
-   = note: inside `<std::boxed::Box<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC: 15:6]>> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC
+   = note: inside `<std::boxed::Box<GeneratorIteratorAdapter<[static generator@$DIR/generator-pinned-moved.rs:LL:CC]>> as std::iter::Iterator>::next` at rustc_src/src/boxed.rs:LL:CC
 note: inside `main` at $DIR/generator-pinned-moved.rs:LL:CC
   --> $DIR/generator-pinned-moved.rs:LL:CC
    |

diff --git a/tests/compile-fail/panic/bad_unwind.stderr b/tests/compile-fail/panic/bad_unwind.stderr
@@ -10,9 +10,9 @@ LL |     std::panic::catch_unwind(|| unwind()).unwrap_err();
    = help: see https://doc.rust-lang.org/nightly/reference/behavior-considered-undefined.html for further information
 
    = note: inside closure at $DIR/bad_unwind.rs:LL:CC
-   = note: inside `std::panicking::r#try::do_call::<[closure@$DIR/bad_unwind.rs:LL:CC: 13:41], ()>` at rustc_src/src/panicking.rs:LL:CC
-   = note: inside `std::panicking::r#try::<(), [closure@$DIR/bad_unwind.rs:LL:CC: 13:41]>` at rustc_src/src/panicking.rs:LL:CC
-   = note: inside `std::panic::catch_unwind::<[closure@$DIR/bad_unwind.rs:LL:CC: 13:41], ()>` at rustc_src/src/panic.rs:LL:CC
+   = note: inside `std::panicking::r#try::do_call::<[closure@$DIR/bad_unwind.rs:LL:CC], ()>` at rustc_src/src/panicking.rs:LL:CC
+   = note: inside `std::panicking::r#try::<(), [closure@$DIR/bad_unwind.rs:LL:CC]>` at rustc_src/src/panicking.rs:LL:CC
+   = note: inside `std::panic::catch_unwind::<[closure@$DIR/bad_unwind.rs:LL:CC], ()>` at rustc_src/src/panic.rs:LL:CC
 note: inside `main` at $DIR/bad_unwind.rs:LL:CC
   --> $DIR/bad_unwind.rs:LL:CC
    |

diff --git a/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr b/tests/compile-fail/stacked_borrows/deallocate_against_barrier1.stderr
@@ -13,7 +13,7 @@ note: inside closure at $DIR/deallocate_against_barrier1.rs:LL:CC
    |
 LL |         drop(unsafe { Box::from_raw(raw) });
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: inside `<[closure@$DIR/deallocate_against_barrier1.rs:LL:CC: 12:6] as std::ops::FnOnce<(&mut i32,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC
+   = note: inside `<[closure@$DIR/deallocate_against_barrier1.rs:LL:CC] as std::ops::FnOnce<(&mut i32,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC
 note: inside `inner` at $DIR/deallocate_against_barrier1.rs:LL:CC
   --> $DIR/deallocate_against_barrier1.rs:LL:CC
    |

diff --git a/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr b/tests/compile-fail/stacked_borrows/deallocate_against_barrier2.stderr
@@ -13,7 +13,7 @@ note: inside closure at $DIR/deallocate_against_barrier2.rs:LL:CC
    |
 LL |         drop(unsafe { Box::from_raw(raw) });
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   = note: inside `<[closure@$DIR/deallocate_against_barrier2.rs:LL:CC: 16:6] as std::ops::FnOnce<(&std::cell::Cell<i32>,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC
+   = note: inside `<[closure@$DIR/deallocate_against_barrier2.rs:LL:CC] as std::ops::FnOnce<(&std::cell::Cell<i32>,)>>::call_once - shim` at rustc_src/src/ops/function.rs:LL:CC
 note: inside `inner` at $DIR/deallocate_against_barrier2.rs:LL:CC
   --> $DIR/deallocate_against_barrier2.rs:LL:CC
    |

diff --git a/tests/compiletest.rs b/tests/compiletest.rs
@@ -80,7 +80,7 @@ regexes! {
 regexes! {
     STDERR:
     // erase line and column info
-    r"\.rs:[0-9]+:[0-9]+"            => ".rs:LL:CC",
+    r"\.rs:[0-9]+:[0-9]+(: [0-9]+:[0-9]+)?" => ".rs:LL:CC",
     // erase alloc ids
     "alloc[0-9]+"                    => "ALLOC",
     // erase Stacked Borrows tags
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0f06824013761ed6829887019033f1001e68f623
		c35035cefc709abddabfb28ecc6a326458d46ce2