rv 1

nyurik · nyurik · commit e66eeba75187 · 2022-09-30T21:09:43.000-04:00
diff --git a/tests/ui/assertions_on_result_states.fixed b/tests/ui/assertions_on_result_states.fixed
@@ -1,6 +1,5 @@
 // run-rustfix
 #![warn(clippy::assertions_on_result_states)]
-#![allow(clippy::uninlined_format_args)]
 
 use std::result::Result;
 
@@ -47,10 +46,10 @@ fn main() {
 
     // test ok that shouldn't be moved
     let r: Result<CopyFoo, DebugFoo> = Ok(CopyFoo);
-    fn test_ref_unmovable_ok(r: &Result<CopyFoo, DebugFoo>) {
+    fn test_ref_unmoveable_ok(r: &Result<CopyFoo, DebugFoo>) {
         assert!(r.is_ok());
     }
-    test_ref_unmovable_ok(&r);
+    test_ref_unmoveable_ok(&r);
     assert!(r.is_ok());
     r.unwrap();
 
diff --git a/tests/ui/assertions_on_result_states.rs b/tests/ui/assertions_on_result_states.rs
@@ -1,6 +1,5 @@
 // run-rustfix
 #![warn(clippy::assertions_on_result_states)]
-#![allow(clippy::uninlined_format_args)]
 
 use std::result::Result;
 
@@ -47,10 +46,10 @@ fn main() {
 
     // test ok that shouldn't be moved
     let r: Result<CopyFoo, DebugFoo> = Ok(CopyFoo);
-    fn test_ref_unmovable_ok(r: &Result<CopyFoo, DebugFoo>) {
+    fn test_ref_unmoveable_ok(r: &Result<CopyFoo, DebugFoo>) {
         assert!(r.is_ok());
     }
-    test_ref_unmovable_ok(&r);
+    test_ref_unmoveable_ok(&r);
     assert!(r.is_ok());
     r.unwrap();
 
diff --git a/tests/ui/assertions_on_result_states.stderr b/tests/ui/assertions_on_result_states.stderr
@@ -1,43 +1,43 @@
 error: called `assert!` with `Result::is_ok`
-  --> $DIR/assertions_on_result_states.rs:25:5
+  --> $DIR/assertions_on_result_states.rs:24:5
    |
 LL |     assert!(r.is_ok());
    |     ^^^^^^^^^^^^^^^^^^ help: replace with: `r.unwrap()`
    |
    = note: `-D clippy::assertions-on-result-states` implied by `-D warnings`
 
 error: called `assert!` with `Result::is_ok`
-  --> $DIR/assertions_on_result_states.rs:43:5
+  --> $DIR/assertions_on_result_states.rs:42:5
    |
 LL |     assert!(get_ok().is_ok());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `get_ok().unwrap()`
 
 error: called `assert!` with `Result::is_ok`
-  --> $DIR/assertions_on_result_states.rs:46:5
+  --> $DIR/assertions_on_result_states.rs:45:5
    |
 LL |     assert!(get_ok_macro!().is_ok());
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: replace with: `get_ok_macro!().unwrap()`
 
 error: called `assert!` with `Result::is_ok`
-  --> $DIR/assertions_on_result_states.rs:59:5
+  --> $DIR/assertions_on_result_states.rs:58:5
    |
 LL |     assert!(r.is_ok());
    |     ^^^^^^^^^^^^^^^^^^ help: replace with: `r.unwrap()`
 
 error: called `assert!` with `Result::is_ok`
-  --> $DIR/assertions_on_result_states.rs:65:9
+  --> $DIR/assertions_on_result_states.rs:64:9
    |
 LL |         assert!(r.is_ok());
    |         ^^^^^^^^^^^^^^^^^^ help: replace with: `r.unwrap()`
 
 error: called `assert!` with `Result::is_err`
-  --> $DIR/assertions_on_result_states.rs:73:5
+  --> $DIR/assertions_on_result_states.rs:72:5
    |
 LL |     assert!(r.is_err());
    |     ^^^^^^^^^^^^^^^^^^^ help: replace with: `r.unwrap_err()`
 
 error: called `assert!` with `Result::is_err`
-  --> $DIR/assertions_on_result_states.rs:83:5
+  --> $DIR/assertions_on_result_states.rs:82:5
    |
 LL |     assert!(res.is_err())
    |     ^^^^^^^^^^^^^^^^^^^^^ help: replace with: `res.unwrap_err();`
diff --git a/tests/ui/branches_sharing_code/shared_at_bottom.rs b/tests/ui/branches_sharing_code/shared_at_bottom.rs
@@ -12,10 +12,10 @@ fn simple_examples() {
         let start_value = 0;
         println!("=^.^=");
 
-        // Same but not movable due to `start_value`
+        // Same but not moveable due to `start_value`
         let _ = start_value;
 
-        // The rest is self contained and movable => Only lint the rest
+        // The rest is self contained and moveable => Only lint the rest
         let result = false;
         println!("Block end!");
         result
@@ -24,10 +24,10 @@ fn simple_examples() {
         let start_value = 8;
         println!("xD");
 
-        // Same but not movable due to `start_value`
+        // Same but not moveable due to `start_value`
         let _ = start_value;
 
-        // The rest is self contained and movable => Only lint the rest
+        // The rest is self contained and moveable => Only lint the rest
         let result = false;
         println!("Block end!");
         result
@@ -56,15 +56,15 @@ fn simple_examples() {
         println!("I'm a local because I use the value `z`: `{}`", z);
 
         println!(
-            "I'm movable because I know: `outer_scope_value`: '{}'",
+            "I'm moveable because I know: `outer_scope_value`: '{}'",
             outer_scope_value
         );
     } else {
         let z = 45678000;
         println!("I'm a local because I use the value `z`: `{}`", z);
 
         println!(
-            "I'm movable because I know: `outer_scope_value`: '{}'",
+            "I'm moveable because I know: `outer_scope_value`: '{}'",
             outer_scope_value
         );
     }
@@ -111,7 +111,7 @@ fn simple_but_suggestion_is_invalid() {
 }
 
 /// Tests where the blocks are not linted due to the used value scope
-fn not_movable_due_to_value_scope() {
+fn not_moveable_due_to_value_scope() {
     let x = 18;
 
     // Using a local value in the moved code
diff --git a/tests/ui/branches_sharing_code/shared_at_bottom.stderr b/tests/ui/branches_sharing_code/shared_at_bottom.stderr
@@ -38,7 +38,7 @@ error: all if blocks contain the same code at the end
   --> $DIR/shared_at_bottom.rs:66:5
    |
 LL | /         println!(
-LL | |             "I'm movable because I know: `outer_scope_value`: '{}'",
+LL | |             "I'm moveable because I know: `outer_scope_value`: '{}'",
 LL | |             outer_scope_value
 LL | |         );
 LL | |     }
@@ -48,7 +48,7 @@ help: consider moving these statements after the if
    |
 LL ~     }
 LL +     println!(
-LL +         "I'm movable because I know: `outer_scope_value`: '{}'",
+LL +         "I'm moveable because I know: `outer_scope_value`: '{}'",
 LL +         outer_scope_value
 LL +     );
    |
diff --git a/tests/ui/branches_sharing_code/shared_at_top.rs b/tests/ui/branches_sharing_code/shared_at_top.rs
@@ -72,11 +72,11 @@ fn simple_but_suggestion_is_invalid() {
     let _ = can_be_overridden;
     if x == 11 {
         let can_be_overridden = "Move me";
-        println!("I'm also movable");
+        println!("I'm also moveable");
         let _ = 111;
     } else {
         let can_be_overridden = "Move me";
-        println!("I'm also movable");
+        println!("I'm also moveable");
         let _ = 222;
     }
 }
diff --git a/tests/ui/branches_sharing_code/shared_at_top.stderr b/tests/ui/branches_sharing_code/shared_at_top.stderr
@@ -68,14 +68,14 @@ error: all if blocks contain the same code at the start
    |
 LL | /     if x == 11 {
 LL | |         let can_be_overridden = "Move me";
-LL | |         println!("I'm also movable");
-   | |_____________________________________^
+LL | |         println!("I'm also moveable");
+   | |______________________________________^
    |
    = warning: some moved values might need to be renamed to avoid wrong references
 help: consider moving these statements before the if
    |
 LL ~     let can_be_overridden = "Move me";
-LL +     println!("I'm also movable");
+LL +     println!("I'm also moveable");
 LL +     if x == 11 {
    |
 
diff --git a/tests/ui/empty_line_after_outer_attribute.rs b/tests/ui/empty_line_after_outer_attribute.rs
@@ -1,8 +1,8 @@
 // aux-build:proc_macro_attr.rs
+#![warn(clippy::empty_line_after_outer_attr)]
+#![allow(clippy::assertions_on_constants)]
 #![feature(custom_inner_attributes)]
 #![rustfmt::skip]
-#![warn(clippy::empty_line_after_outer_attr)]
-#![allow(clippy::assertions_on_constants, clippy::uninlined_format_args)]
 
 #[macro_use]
 extern crate proc_macro_attr;

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ error: all if blocks contain the same code at the end`
`38`	`38`	`--> $DIR/shared_at_bottom.rs:66:5`
`39`	`39`	`\|`
`40`	`40`	`LL \| / println!(`
`41`		-LL \| \| "I'm movable because I know: `outer_scope_value`: '{}'",
	`41`	+LL \| \| "I'm moveable because I know: `outer_scope_value`: '{}'",
`42`	`42`	`LL \| \| outer_scope_value`
`43`	`43`	`LL \| \| );`
`44`	`44`	`LL \| \| }`
`@@ -48,7 +48,7 @@ help: consider moving these statements after the if`
`48`	`48`	`\|`
`49`	`49`	`LL ~ }`
`50`	`50`	`LL + println!(`
`51`		-LL + "I'm movable because I know: `outer_scope_value`: '{}'",
	`51`	+LL + "I'm moveable because I know: `outer_scope_value`: '{}'",
`52`	`52`	`LL + outer_scope_value`
`53`	`53`	`LL + );`
`54`	`54`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -72,11 +72,11 @@ fn simple_but_suggestion_is_invalid() {`
`72`	`72`	`let _ = can_be_overridden;`
`73`	`73`	`if x == 11 {`
`74`	`74`	`let can_be_overridden = "Move me";`
`75`		`- println!("I'm also movable");`
	`75`	`+ println!("I'm also moveable");`
`76`	`76`	`let _ = 111;`
`77`	`77`	`} else {`
`78`	`78`	`let can_be_overridden = "Move me";`
`79`		`- println!("I'm also movable");`
	`79`	`+ println!("I'm also moveable");`
`80`	`80`	`let _ = 222;`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,14 +68,14 @@ error: all if blocks contain the same code at the start`
`68`	`68`	`\|`
`69`	`69`	`LL \| / if x == 11 {`
`70`	`70`	`LL \| \| let can_be_overridden = "Move me";`
`71`		`-LL \| \| println!("I'm also movable");`
`72`		`- \| \|_____________________________________^`
	`71`	`+LL \| \| println!("I'm also moveable");`
	`72`	`+ \| \|______________________________________^`
`73`	`73`	`\|`
`74`	`74`	`= warning: some moved values might need to be renamed to avoid wrong references`
`75`	`75`	`help: consider moving these statements before the if`
`76`	`76`	`\|`
`77`	`77`	`LL ~ let can_be_overridden = "Move me";`
`78`		`-LL + println!("I'm also movable");`
	`78`	`+LL + println!("I'm also moveable");`
`79`	`79`	`LL + if x == 11 {`
`80`	`80`	`\|`
`81`	`81`