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

bors · bors · commit f76c608199bf · 2023-01-15T21:53:07.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-279f1c9d8c26a8d227ae8ab806d262bb784b251b
+9e75dddf609c0201d03f9792e850f95d6a283d11
diff --git a/tests/pass-dep/shims/libc-fs-with-isolation.rs b/tests/pass-dep/shims/libc-fs-with-isolation.rs
@@ -22,7 +22,8 @@ fn main() {
     }
 
     // test `stat`
-    assert_eq!(fs::metadata("foo.txt").unwrap_err().kind(), ErrorKind::PermissionDenied);
+    let err = fs::metadata("foo.txt").unwrap_err();
+    assert_eq!(err.kind(), ErrorKind::PermissionDenied);
     // check that it is the right kind of `PermissionDenied`
-    assert_eq!(Error::last_os_error().raw_os_error(), Some(libc::EACCES));
+    assert_eq!(err.raw_os_error(), Some(libc::EACCES));
 }

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@ fn main() {`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	// test `stat`
`25`		`- assert_eq!(fs::metadata("foo.txt").unwrap_err().kind(), ErrorKind::PermissionDenied);`
	`25`	`+ let err = fs::metadata("foo.txt").unwrap_err();`
	`26`	`+ assert_eq!(err.kind(), ErrorKind::PermissionDenied);`
`26`	`27`	// check that it is the right kind of `PermissionDenied`
`27`		`- assert_eq!(Error::last_os_error().raw_os_error(), Some(libc::EACCES));`
	`28`	`+ assert_eq!(err.raw_os_error(), Some(libc::EACCES));`
`28`	`29`	`}`