From 95f04f80fb50dc3c3648cbdd4ecefb9fe508f303 Mon Sep 17 00:00:00 2001 From: messense Date: Mon, 3 Jul 2017 12:37:14 +0800 Subject: [PATCH] Update ui tests --- tests/ui-posix/conf_non_existant.stderr | 2 +- tests/ui/builtin-type-shadow.stderr | 2 +- tests/ui/conf_bad_arg.stderr | 2 +- tests/ui/conf_bad_toml.stderr | 2 +- tests/ui/conf_bad_type.stderr | 2 +- tests/ui/conf_french_blacklisted_name.stderr | 12 ------ tests/ui/conf_path_non_string.stderr | 2 +- tests/ui/conf_unknown_key.stderr | 2 +- tests/ui/ices.stderr | 2 +- tests/ui/transmute.stderr | 44 -------------------- tests/ui/transmute_64bit.stderr | 2 - 11 files changed, 8 insertions(+), 66 deletions(-) diff --git a/tests/ui-posix/conf_non_existant.stderr b/tests/ui-posix/conf_non_existant.stderr index a7f000800014..7920bd35589d 100644 --- a/tests/ui-posix/conf_non_existant.stderr +++ b/tests/ui-posix/conf_non_existant.stderr @@ -1,4 +1,4 @@ error: error reading Clippy's configuration file: No such file or directory (os error 2) -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/builtin-type-shadow.stderr b/tests/ui/builtin-type-shadow.stderr index 59d034821235..269ff9a0eef5 100644 --- a/tests/ui/builtin-type-shadow.stderr +++ b/tests/ui/builtin-type-shadow.stderr @@ -15,5 +15,5 @@ error[E0308]: mismatched types = note: expected type `u32` found type `{integer}` -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/conf_bad_arg.stderr b/tests/ui/conf_bad_arg.stderr index 35f70338017e..92b3c82d4583 100644 --- a/tests/ui/conf_bad_arg.stderr +++ b/tests/ui/conf_bad_arg.stderr @@ -10,5 +10,5 @@ note: Clippy will use default configuration 4 | #![plugin(clippy(conf_file))] | ^^^^^^^^^ -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/conf_bad_toml.stderr b/tests/ui/conf_bad_toml.stderr index b8bfeb333bd8..8ee392f89248 100644 --- a/tests/ui/conf_bad_toml.stderr +++ b/tests/ui/conf_bad_toml.stderr @@ -1,4 +1,4 @@ error: error reading Clippy's configuration file: expected an equals, found an identifier at line 1 -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/conf_bad_type.stderr b/tests/ui/conf_bad_type.stderr index ee9bbeef81f9..5cb4d05afef2 100644 --- a/tests/ui/conf_bad_type.stderr +++ b/tests/ui/conf_bad_type.stderr @@ -1,4 +1,4 @@ error: error reading Clippy's configuration file: invalid type: integer `42`, expected a sequence -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/conf_french_blacklisted_name.stderr b/tests/ui/conf_french_blacklisted_name.stderr index 3d6926a9b882..b6782ae4212e 100644 --- a/tests/ui/conf_french_blacklisted_name.stderr +++ b/tests/ui/conf_french_blacklisted_name.stderr @@ -11,46 +11,34 @@ warning: use of a blacklisted/placeholder name `toto` | 12 | let toto = 42; | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default warning: use of a blacklisted/placeholder name `tata` --> $DIR/conf_french_blacklisted_name.rs:13:9 | 13 | let tata = 42; | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default warning: use of a blacklisted/placeholder name `titi` --> $DIR/conf_french_blacklisted_name.rs:14:9 | 14 | let titi = 42; | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default warning: use of a blacklisted/placeholder name `toto` --> $DIR/conf_french_blacklisted_name.rs:20:10 | 20 | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default warning: use of a blacklisted/placeholder name `tata` --> $DIR/conf_french_blacklisted_name.rs:20:21 | 20 | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default warning: use of a blacklisted/placeholder name `titi` --> $DIR/conf_french_blacklisted_name.rs:20:28 | 20 | (toto, Some(tata), titi @ Some(_)) => (), | ^^^^ - | - = note: #[warn(blacklisted_name)] on by default diff --git a/tests/ui/conf_path_non_string.stderr b/tests/ui/conf_path_non_string.stderr index fd893ab370df..3bf53f10cce4 100644 --- a/tests/ui/conf_path_non_string.stderr +++ b/tests/ui/conf_path_non_string.stderr @@ -10,5 +10,5 @@ note: Clippy will use default configuration 3 | #![plugin(clippy(conf_file=42))] | ^^ -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/conf_unknown_key.stderr b/tests/ui/conf_unknown_key.stderr index b28224a78071..bd16dfd47da9 100644 --- a/tests/ui/conf_unknown_key.stderr +++ b/tests/ui/conf_unknown_key.stderr @@ -1,4 +1,4 @@ error: error reading Clippy's configuration file: unknown field `foobar`, expected one of `blacklisted-names`, `cyclomatic-complexity-threshold`, `doc-valid-idents`, `too-many-arguments-threshold`, `type-complexity-threshold`, `single-char-binding-names-threshold`, `too-large-for-stack`, `enum-variant-name-threshold`, `enum-variant-size-threshold`, `third-party` -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/ices.stderr b/tests/ui/ices.stderr index cc681100730b..cadd7cd417d4 100644 --- a/tests/ui/ices.stderr +++ b/tests/ui/ices.stderr @@ -4,5 +4,5 @@ error: cannot find macro `fubar!` in this scope 3 | fubar!(); | ^^^^^ -error: aborting due to previous error(s) +error: aborting due to previous error diff --git a/tests/ui/transmute.stderr b/tests/ui/transmute.stderr index b70e5e088307..f878b6ad1730 100644 --- a/tests/ui/transmute.stderr +++ b/tests/ui/transmute.stderr @@ -11,24 +11,18 @@ warning: transmute from a reference to a pointer | 26 | let _: *const T = core::intrinsics::transmute(t); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `t as *const T` - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a reference to a pointer --> $DIR/transmute.rs:28:21 | 28 | let _: *mut T = core::intrinsics::transmute(t); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `t as *const T as *mut T` - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a reference to a pointer --> $DIR/transmute.rs:30:23 | 30 | let _: *const U = core::intrinsics::transmute(t); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `t as *const T as *const U` - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a pointer type (`*const T`) to a reference type (`&T`) --> $DIR/transmute.rs:35:17 @@ -43,128 +37,96 @@ warning: transmute from a pointer type (`*mut T`) to a reference type (`&mut T`) | 38 | let _: &mut T = std::mem::transmute(m); | ^^^^^^^^^^^^^^^^^^^^^^ help: try `&mut *m` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*mut T`) to a reference type (`&T`) --> $DIR/transmute.rs:41:17 | 41 | let _: &T = std::mem::transmute(m); | ^^^^^^^^^^^^^^^^^^^^^^ help: try `&*m` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*mut T`) to a reference type (`&mut T`) --> $DIR/transmute.rs:44:21 | 44 | let _: &mut T = std::mem::transmute(p as *mut T); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `&mut *(p as *mut T)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*const U`) to a reference type (`&T`) --> $DIR/transmute.rs:47:17 | 47 | let _: &T = std::mem::transmute(o); | ^^^^^^^^^^^^^^^^^^^^^^ help: try `&*(o as *const T)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*mut U`) to a reference type (`&mut T`) --> $DIR/transmute.rs:50:21 | 50 | let _: &mut T = std::mem::transmute(om); | ^^^^^^^^^^^^^^^^^^^^^^^ help: try `&mut *(om as *mut T)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*mut U`) to a reference type (`&T`) --> $DIR/transmute.rs:53:17 | 53 | let _: &T = std::mem::transmute(om); | ^^^^^^^^^^^^^^^^^^^^^^^ help: try `&*(om as *const T)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*const i32`) to a reference type (`&issue1231::Foo<'_, u8>`) --> $DIR/transmute.rs:64:32 | 64 | let _: &Foo = unsafe { std::mem::transmute::<_, &Foo<_>>(raw) }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `&*(raw as *const Foo<_>)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*const i32`) to a reference type (`&issue1231::Foo<'_, &u8>`) --> $DIR/transmute.rs:66:33 | 66 | let _: &Foo<&u8> = unsafe { std::mem::transmute::<_, &Foo<&_>>(raw) }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `&*(raw as *const Foo<&_>)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a pointer type (`*const i32`) to a reference type (`&u8`) --> $DIR/transmute.rs:70:14 | 70 | unsafe { std::mem::transmute::<_, Bar>(raw) }; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `&*(raw as *const u8)` - | - = note: #[warn(transmute_ptr_to_ref)] on by default warning: transmute from a type (`std::vec::Vec`) to itself --> $DIR/transmute.rs:76:27 | 76 | let _: Vec = core::intrinsics::transmute(my_vec()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a type (`std::vec::Vec`) to itself --> $DIR/transmute.rs:78:27 | 78 | let _: Vec = core::mem::transmute(my_vec()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a type (`std::vec::Vec`) to itself --> $DIR/transmute.rs:80:27 | 80 | let _: Vec = std::intrinsics::transmute(my_vec()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a type (`std::vec::Vec`) to itself --> $DIR/transmute.rs:82:27 | 82 | let _: Vec = std::mem::transmute(my_vec()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a type (`std::vec::Vec`) to itself --> $DIR/transmute.rs:84:27 | 84 | let _: Vec = my_transmute(my_vec()); | ^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(useless_transmute)] on by default warning: transmute from an integer to a pointer --> $DIR/transmute.rs:92:31 | 92 | let _: *const usize = std::mem::transmute(5_isize); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `5_isize as *const usize` - | - = note: #[warn(useless_transmute)] on by default warning: transmute from an integer to a pointer --> $DIR/transmute.rs:96:31 | 96 | let _: *const usize = std::mem::transmute(1+1usize); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try `(1+1usize) as *const usize` - | - = note: #[warn(useless_transmute)] on by default warning: transmute from a type (`*const Usize`) to the type that it points to (`Usize`) --> $DIR/transmute.rs:111:24 @@ -179,22 +141,16 @@ warning: transmute from a type (`*mut Usize`) to the type that it points to (`Us | 113 | let _: Usize = core::intrinsics::transmute(int_mut_ptr); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(crosspointer_transmute)] on by default warning: transmute from a type (`Usize`) to a pointer to that type (`*const Usize`) --> $DIR/transmute.rs:115:31 | 115 | let _: *const Usize = core::intrinsics::transmute(my_int()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(crosspointer_transmute)] on by default warning: transmute from a type (`Usize`) to a pointer to that type (`*mut Usize`) --> $DIR/transmute.rs:117:29 | 117 | let _: *mut Usize = core::intrinsics::transmute(my_int()); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(crosspointer_transmute)] on by default diff --git a/tests/ui/transmute_64bit.stderr b/tests/ui/transmute_64bit.stderr index 88160ed8c9e4..595696180457 100644 --- a/tests/ui/transmute_64bit.stderr +++ b/tests/ui/transmute_64bit.stderr @@ -11,6 +11,4 @@ warning: transmute from a `f64` to a pointer | 11 | let _: *mut usize = std::mem::transmute(6.0f64); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: #[warn(wrong_transmute)] on by default