Skip to content

Commit 75910b5

Browse files
committed
Auto merge of #106866 - matthiaskrgr:rollup-r063s44, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #105526 (libcore: make result of iter::from_generator Clone) - #106563 (Fix `unused_braces` on generic const expr macro call) - #106661 (Stop probing for statx unless necessary) - #106820 (Deprioritize fulfillment errors that come from expansions.) - #106828 (rustdoc: remove `docblock` class from notable trait popover) - #106849 (Allocate one less vec while parsing arrays) - #106855 (rustdoc: few small cleanups) - #106860 (Remove various double spaces in the libraries.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents cb7b0f2 + ed3ae3e commit 75910b5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tests/pass-dep/shims/libc-fs-with-isolation.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ fn main() {
2222
}
2323

2424
// 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);
2627
// 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));
2829
}

0 commit comments

Comments
 (0)