diff options
| author | bors <bors@rust-lang.org> | 2022-10-24 10:01:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-24 10:01:46 +0000 |
| commit | cfd99a2bbe83ae35ad0eb9d963ca97cf6c34471a (patch) | |
| tree | c31ba59d4b290c814ac64a60a2e42b902b8297bf | |
| parent | a157e0e88f08fd7f5a5a61412f04043480cddb17 (diff) | |
| parent | 7b83059146b6cfb367bbee7cd97370fc271e8979 (diff) | |
| download | rust-cfd99a2bbe83ae35ad0eb9d963ca97cf6c34471a.tar.gz rust-cfd99a2bbe83ae35ad0eb9d963ca97cf6c34471a.zip | |
Auto merge of #2616 - RalfJung:rustup, r=RalfJung
rustup With https://github.com/rust-lang/rust/pull/103360 having landed, I don't think we still need this `GetFileInformationByHandleEx` shim.
| -rw-r--r-- | src/tools/miri/rust-version | 2 | ||||
| -rw-r--r-- | src/tools/miri/src/shims/windows/foreign_items.rs | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version index eb0301bee2a..768658b1a12 100644 --- a/src/tools/miri/rust-version +++ b/src/tools/miri/rust-version @@ -1 +1 @@ -b1ab3b738ac718da74cd4aa0bb7f362d0adbdf84 +56f132565eb31eeb9ec7e1800a6ab2ca354e710e diff --git a/src/tools/miri/src/shims/windows/foreign_items.rs b/src/tools/miri/src/shims/windows/foreign_items.rs index 184ba997fc8..2a34a3a47bb 100644 --- a/src/tools/miri/src/shims/windows/foreign_items.rs +++ b/src/tools/miri/src/shims/windows/foreign_items.rs @@ -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] = |