Skip to content

Rollup of 8 pull requests #106866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
Jan 15, 2023
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a8b5d4b
libcore: make result type of iter::from_generator concrete
Xiretza Dec 10, 2022
17a0740
libcore: make result of iter::from_generator Clone
Xiretza Dec 10, 2022
753e576
Fix up stat test in libc-fs-with-isolation
mjguzik Jan 11, 2023
b49aa8d
Stop probing for statx unless necessary
mjguzik Jan 10, 2023
60cc778
evade clones
klensy Jan 12, 2023
4e1258c
IndexItem.name String -> Symbol
klensy Jan 13, 2023
cda6efe
generate_macro_def_id_path: don't eagerly stringify Symbols
klensy Jan 13, 2023
81b637b
fmt_type: don't alloc const String, use &str instead
klensy Jan 13, 2023
ffb2e84
Playground.crate_name String -> Symbol
klensy Jan 13, 2023
8998bd3
CrateData: don't allocate String when Serialize, &str is enough
klensy Jan 13, 2023
5314ed5
rustdoc: remove `docblock` class from notable trait popover
notriddle Jan 13, 2023
ea13023
Allocate one less vec in `parser/expr.rs`
WaffleLapkin Jan 14, 2023
6821adb
Deprioritize fulfillment errors that come from expansions.
m-ou-se Jan 13, 2023
4f64de8
Fix `unused_braces` on generic const expr macro call
clubby789 Jan 7, 2023
0b35f44
Remove various double spaces in source comments.
anden3 Jan 14, 2023
2fea03f
Fix some missed double spaces.
anden3 Jan 14, 2023
085d2f1
Rollup merge of #105526 - Xiretza:iter-from-generator-derive, r=scottmcm
matthiaskrgr Jan 14, 2023
d7bc758
Rollup merge of #106563 - clubby789:gce-macro-braces, r=TaKO8Ki
matthiaskrgr Jan 14, 2023
4313471
Rollup merge of #106661 - mjguzik:linux_statx, r=Mark-Simulacrum
matthiaskrgr Jan 14, 2023
f04f97c
Rollup merge of #106820 - m-ou-se:macro-type-error-thing, r=estebank
matthiaskrgr Jan 14, 2023
14fbc21
Rollup merge of #106828 - notriddle:notriddle/notable-trait-docblock,…
matthiaskrgr Jan 14, 2023
9db8e6d
Rollup merge of #106849 - WaffleLapkin:unvec, r=Nilstrieb
matthiaskrgr Jan 14, 2023
bc0c816
Rollup merge of #106855 - klensy:rd-s, r=notriddle
matthiaskrgr Jan 14, 2023
e0eb63a
Rollup merge of #106860 - anden3:doc-double-spaces, r=Dylan-DPC
matthiaskrgr Jan 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix up stat test in libc-fs-with-isolation
The test relied on Error::last_os_error() coming from the stat call on
the passed file, but there is no guarantee this will be the case.

Instead extract errno from the error returned by the routine.

Patch de facto written by joboet.

Co-authored-by:	joboet <jonasboettiger@icloud.com>
  • Loading branch information
mjguzik committed Jan 11, 2023
commit 753e57672296e13c534f87b6e2672a73fff4965c
5 changes: 3 additions & 2 deletions src/tools/miri/tests/pass-dep/shims/libc-fs-with-isolation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}