Auto merge of #1455 - RalfJung:rustup, r=RalfJung

Rustup

also stop testing with mir opts as they are currently broken

Author: bors

ci.sh

@@ -23,10 +23,11 @@ function run_tests {
   fi
 
   ./miri test --locked
-  if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
+  #if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
     # Only for host architecture: tests with MIR optimizations
-    MIRI_TEST_FLAGS="-Z mir-opt-level=3" ./miri test --locked
-  fi
+    # FIXME: disabled because of <https://github.com/rust-lang/rust/issues/73609>.
+    #MIRI_TEST_FLAGS="-Z mir-opt-level=3" ./miri test --locked
+  #fi
   # "miri test" has built the sysroot for us, now this should pass without
   # any interactive questions.
   ${PYTHON:-python3} test-cargo-miri/run-test.py

rust-version

@@ -1 +1 @@
-033013cab3a861224fd55f494c8be1cb0349eb49
+1a4e2b6f9c75a0e21722c88a0e3b610d6ffc3ae3

tests/run-pass/issue-73223.rs

@@ -0,0 +1,22 @@
+fn main() {
+    let mut state = State { prev: None, next: Some(8) };
+    let path = "/nested/some/more";
+    assert_eq!(state.rest(path), "some/more");
+}
+
+struct State {
+    prev: Option<usize>,
+    next: Option<usize>,
+}
+
+impl State {
+    fn rest<'r>(&mut self, path: &'r str) -> &'r str {
+        let start = match self.next.take() {
+            Some(v) => v,
+            None => return "",
+        };
+
+        self.prev = Some(start);
+        &path[start..]
+    }
+}