mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #2707 - oli-obk:ui_test_bump, r=RalfJung

Browse Source 
Bump ui_test crate

All commands can now be revisioned: https://github.com/oli-obk/ui_test/pull/33
This commit is contained in:
bors 2022-12-01 14:51:45 +00:00
commit 4a12a13b58
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/miri/Cargo.lock
View File

@ -724,9 +724,9 @@ dependencies = [
[[package]] [[package]]
name = "ui_test" name = "ui_test"
version = "0.4.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4559da3fe6b481f8674a29379677cb9606cd6f75fc254a2c9834c55638503d" checksum = "54ddb6f31025943e2f9d59237f433711c461a43d9415974c3eb3a4902edc1c1f"
dependencies = [ dependencies = [
"bstr", "bstr",
"cargo_metadata", "cargo_metadata",

2
src/tools/miri/Cargo.toml
View File

@ -39,7 +39,7 @@ libloading = "0.7"
[dev-dependencies] [dev-dependencies]
colored = "2" colored = "2"
ui_test = "0.4" ui_test = "0.5"
rustc_version = "0.4" rustc_version = "0.4"
# Features chosen to match those required by env_logger, to avoid rebuilds # Features chosen to match those required by env_logger, to avoid rebuilds
regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] } regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }

6
src/tools/miri/tests/fail/function_calls/exported_symbol_abi_mismatch.rs
View File

@ -12,7 +12,7 @@ fn main() {
#[cfg(fn_ptr)] #[cfg(fn_ptr)]
unsafe { unsafe {
std::mem::transmute::<unsafe fn(), unsafe extern "C" fn()>(foo)(); std::mem::transmute::<unsafe fn(), unsafe extern "C" fn()>(foo)();
//[fn_ptr]~^ ERROR: calling a function with calling convention Rust using calling convention C //~[fn_ptr]^ ERROR: calling a function with calling convention Rust using calling convention C
} }
// `Instance` caching should not suppress ABI check. // `Instance` caching should not suppress ABI check.
@ -28,8 +28,8 @@ fn main() {
} }
unsafe { unsafe {
foo(); foo();
//[no_cache]~^ ERROR: calling a function with calling convention Rust using calling convention C //~[no_cache]^ ERROR: calling a function with calling convention Rust using calling convention C
//[cache]~| ERROR: calling a function with calling convention Rust using calling convention C //~[cache]| ERROR: calling a function with calling convention Rust using calling convention C
} }
} }
} }

6
src/tools/miri/tests/fail/function_calls/exported_symbol_bad_unwind2.rs
View File

@ -4,8 +4,8 @@
#[cfg_attr(any(definition, both), rustc_nounwind)] #[cfg_attr(any(definition, both), rustc_nounwind)]
#[no_mangle] #[no_mangle]
extern "C-unwind" fn nounwind() { extern "C-unwind" fn nounwind() {
//[definition]~^ ERROR: abnormal termination: the program aborted execution //~[definition]^ ERROR: abnormal termination: the program aborted execution
//[both]~^^ ERROR: abnormal termination: the program aborted execution //~[both]^^ ERROR: abnormal termination: the program aborted execution
panic!(); panic!();
} }
@ -15,5 +15,5 @@ fn main() {
fn nounwind(); fn nounwind();
} }
unsafe { nounwind() } unsafe { nounwind() }
//[extern_block]~^ ERROR: unwinding past a stack frame that does not allow unwinding //~[extern_block]^ ERROR: unwinding past a stack frame that does not allow unwinding
} }