bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

Browse source 
rustup

With https://github.com/rust-lang/rust/pull/103360 having landed, I don't think we still need this `GetFileInformationByHandleEx` shim.
This commit is contained in:
bors 2022-10-24 10:01:46 +00:00
commit cfd99a2bbe
2 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/miri/rust-version
View file

@ -1 +1 @@
b1ab3b738ac718da74cd4aa0bb7f362d0adbdf84
56f132565eb31eeb9ec7e1800a6ab2ca354e710e

7
src/tools/miri/src/shims/windows/foreign_items.rs
View file

@ -418,13 +418,6 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
// Indicate an error.
this.write_null(dest)?;
}
"GetFileInformationByHandleEx" if this.frame_in_std() => {
#[allow(non_snake_case)]
let [_hFile, _FileInformationClass, _lpFileInformation, _dwBufferSize] =
this.check_shim(abi, Abi::System { unwind: false }, link_name, args)?;
// Just make it fail.
this.write_null(dest)?;
}
"GetFileType" if this.frame_in_std() => {
#[allow(non_snake_case)]
let [_hFile] =