Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 13:13:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #97892 - klensy:fix-spaces, r=oli-obk

Browse source 
diagnostics: remove trailing spaces

Remove few occurrences of trailing spaces and drive by fix of needless alloc of const string.
This commit is contained in:
bors 2022-06-17 17:30:16 +00:00
commit 09c93018d7
11 changed files with 70 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/ui/eprint_with_newline.stderr
View file

@ -9,7 +9,7 @@ help: use `eprintln!` instead
|
LL - eprint!("Hello/n");
LL + eprintln!("Hello");
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:6:5
@ -21,7 +21,7 @@ help: use `eprintln!` instead
|
LL - eprint!("Hello {}/n", "world");
LL + eprintln!("Hello {}", "world");
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:7:5
@ -33,7 +33,7 @@ help: use `eprintln!` instead
|
LL - eprint!("Hello {} {}/n", "world", "#2");
LL + eprintln!("Hello {} {}", "world", "#2");
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:8:5
@ -45,7 +45,7 @@ help: use `eprintln!` instead
|
LL - eprint!("{}/n", 1265);
LL + eprintln!("{}", 1265);
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:9:5
@ -57,7 +57,7 @@ help: use `eprintln!` instead
|
LL - eprint!("/n");
LL + eprintln!();
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:28:5
@ -69,7 +69,7 @@ help: use `eprintln!` instead
|
LL - eprint!("//n"); // should fail
LL + eprintln!("/"); // should fail
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:35:5
@ -111,7 +111,7 @@ help: use `eprintln!` instead
|
LL - eprint!("/r/n"); //~ ERROR
LL + eprintln!("/r"); //~ ERROR
|
|
error: using `eprint!()` with a format string that ends in a single newline
--> $DIR/eprint_with_newline.rs:48:5
@ -123,7 +123,7 @@ help: use `eprintln!` instead
|
LL - eprint!("foo/rbar/n") // ~ ERROR
LL + eprintln!("foo/rbar") // ~ ERROR
|
|
error: aborting due to 10 previous errors

20
tests/ui/manual_split_once.stderr
View file

@ -96,12 +96,12 @@ help: remove the `iter` usages
|
LL - let l = iter.next().unwrap();
LL +
|
|
help: remove the `iter` usages
|
LL - let r = iter.next().unwrap();
LL +
|
|
error: manual implementation of `split_once`
--> $DIR/manual_split_once.rs:49:5
@ -121,12 +121,12 @@ help: remove the `iter` usages
|
LL - let l = iter.next()?;
LL +
|
|
help: remove the `iter` usages
|
LL - let r = iter.next()?;
LL +
|
|
error: manual implementation of `rsplit_once`
--> $DIR/manual_split_once.rs:53:5
@ -146,12 +146,12 @@ help: remove the `iter` usages
|
LL - let r = iter.next().unwrap();
LL +
|
|
help: remove the `iter` usages
|
LL - let l = iter.next().unwrap();
LL +
|
|
error: manual implementation of `rsplit_once`
--> $DIR/manual_split_once.rs:57:5
@ -171,12 +171,12 @@ help: remove the `iter` usages
|
LL - let r = iter.next()?;
LL +
|
|
help: remove the `iter` usages
|
LL - let l = iter.next()?;
LL +
|
|
error: manual implementation of `split_once`
--> $DIR/manual_split_once.rs:142:13
@ -202,12 +202,12 @@ help: remove the `iter` usages
|
LL - let a = iter.next().unwrap();
LL +
|
|
help: remove the `iter` usages
|
LL - let b = iter.next().unwrap();
LL +
|
|
error: aborting due to 19 previous errors

8
tests/ui/map_unwrap_or.stderr
View file

@ -12,7 +12,7 @@ help: use `map_or(<a>, <f>)` instead
|
LL - let _ = opt.map(|x| x + 1)
LL + let _ = opt.map_or(0, |x| x + 1);
|
|
error: called `map(<f>).unwrap_or(<a>)` on an `Option` value. This can be done more directly by calling `map_or(<a>, <f>)` instead
--> $DIR/map_unwrap_or.rs:20:13
@ -59,7 +59,7 @@ help: use `and_then(<f>)` instead
|
LL - let _ = opt.map(|x| Some(x + 1)).unwrap_or(None);
LL + let _ = opt.and_then(|x| Some(x + 1));
|
|
error: called `map(<f>).unwrap_or(None)` on an `Option` value. This can be done more directly by calling `and_then(<f>)` instead
--> $DIR/map_unwrap_or.rs:31:13
@ -92,7 +92,7 @@ help: use `and_then(<f>)` instead
|
LL - .map(|x| Some(x + 1))
LL + .and_then(|x| Some(x + 1));
|
|
error: called `map(<f>).unwrap_or(<a>)` on an `Option` value. This can be done more directly by calling `map_or(<a>, <f>)` instead
--> $DIR/map_unwrap_or.rs:46:13
@ -104,7 +104,7 @@ help: use `map_or(<a>, <f>)` instead
|
LL - let _ = Some("prefix").map(|p| format!("{}.", p)).unwrap_or(id);
LL + let _ = Some("prefix").map_or(id, |p| format!("{}.", p));
|
|
error: called `map(<f>).unwrap_or_else(<g>)` on an `Option` value. This can be done more directly by calling `map_or_else(<g>, <f>)` instead
--> $DIR/map_unwrap_or.rs:50:13

4
tests/ui/needless_late_init.stderr
View file

@ -164,7 +164,7 @@ help: remove the assignments from the `match` arms
|
LL - 1 => f = "three",
LL + 1 => "three",
|
|
error: unneeded late initialization
--> $DIR/needless_late_init.rs:76:5
@ -180,7 +180,7 @@ help: remove the assignments from the branches
|
LL - g = 5;
LL + 5
|
|
help: add a semicolon after the `if` expression
|
LL | };

22
tests/ui/print_literal.stderr
View file

@ -9,7 +9,7 @@ help: try this
|
LL - print!("Hello {}", "world");
LL + print!("Hello world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:26:36
@ -21,7 +21,7 @@ help: try this
|
LL - println!("Hello {} {}", world, "world");
LL + println!("Hello {} world", world);
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:27:26
@ -33,7 +33,7 @@ help: try this
|
LL - println!("Hello {}", "world");
LL + println!("Hello world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:32:25
@ -45,7 +45,7 @@ help: try this
|
LL - println!("{0} {1}", "hello", "world");
LL + println!("hello {1}", "world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:32:34
@ -57,7 +57,7 @@ help: try this
|
LL - println!("{0} {1}", "hello", "world");
LL + println!("{0} world", "hello");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:33:25
@ -69,7 +69,7 @@ help: try this
|
LL - println!("{1} {0}", "hello", "world");
LL + println!("{1} hello", "world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:33:34
@ -81,7 +81,7 @@ help: try this
|
LL - println!("{1} {0}", "hello", "world");
LL + println!("world {0}", "hello");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:36:29
@ -93,7 +93,7 @@ help: try this
|
LL - println!("{foo} {bar}", foo = "hello", bar = "world");
LL + println!("hello {bar}", bar = "world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:36:44
@ -105,7 +105,7 @@ help: try this
|
LL - println!("{foo} {bar}", foo = "hello", bar = "world");
LL + println!("{foo} world", foo = "hello");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:37:29
@ -117,7 +117,7 @@ help: try this
|
LL - println!("{bar} {foo}", foo = "hello", bar = "world");
LL + println!("{bar} hello", bar = "world");
|
|
error: literal with an empty format string
--> $DIR/print_literal.rs:37:44
@ -129,7 +129,7 @@ help: try this
|
LL - println!("{bar} {foo}", foo = "hello", bar = "world");
LL + println!("world {foo}", foo = "hello");
|
|
error: aborting due to 11 previous errors

16
tests/ui/print_with_newline.stderr
View file

@ -9,7 +9,7 @@ help: use `println!` instead
|
LL - print!("Hello/n");
LL + println!("Hello");
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:9:5
@ -21,7 +21,7 @@ help: use `println!` instead
|
LL - print!("Hello {}/n", "world");
LL + println!("Hello {}", "world");
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:10:5
@ -33,7 +33,7 @@ help: use `println!` instead
|
LL - print!("Hello {} {}/n", "world", "#2");
LL + println!("Hello {} {}", "world", "#2");
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:11:5
@ -45,7 +45,7 @@ help: use `println!` instead
|
LL - print!("{}/n", 1265);
LL + println!("{}", 1265);
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:12:5
@ -57,7 +57,7 @@ help: use `println!` instead
|
LL - print!("/n");
LL + println!();
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:31:5
@ -69,7 +69,7 @@ help: use `println!` instead
|
LL - print!("//n"); // should fail
LL + println!("/"); // should fail
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:38:5
@ -111,7 +111,7 @@ help: use `println!` instead
|
LL - print!("/r/n"); //~ ERROR
LL + println!("/r"); //~ ERROR
|
|
error: using `print!()` with a format string that ends in a single newline
--> $DIR/print_with_newline.rs:51:5
@ -123,7 +123,7 @@ help: use `println!` instead
|
LL - print!("foo/rbar/n") // ~ ERROR
LL + println!("foo/rbar") // ~ ERROR
|
|
error: aborting due to 10 previous errors

4
tests/ui/unnecessary_iter_cloned.stderr
View file

@ -13,7 +13,7 @@ help: remove this `&`
|
LL - let other = match get_file_path(&t) {
LL + let other = match get_file_path(t) {
|
|
error: unnecessary use of `copied`
--> $DIR/unnecessary_iter_cloned.rs:46:22
@ -29,7 +29,7 @@ help: remove this `&`
|
LL - let other = match get_file_path(&t) {
LL + let other = match get_file_path(t) {
|
|
error: aborting due to 2 previous errors

2
tests/ui/unnecessary_to_owned.stderr
View file

@ -489,7 +489,7 @@ help: remove this `&`
|
LL - let path = match get_file_path(&t) {
LL + let path = match get_file_path(t) {
|
|
error: unnecessary use of `to_vec`
--> $DIR/unnecessary_to_owned.rs:221:14

22
tests/ui/write_literal.stderr
View file

@ -9,7 +9,7 @@ help: try this
|
LL - write!(v, "Hello {}", "world");
LL + write!(v, "Hello world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:31:39
@ -21,7 +21,7 @@ help: try this
|
LL - writeln!(v, "Hello {} {}", world, "world");
LL + writeln!(v, "Hello {} world", world);
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:32:29
@ -33,7 +33,7 @@ help: try this
|
LL - writeln!(v, "Hello {}", "world");
LL + writeln!(v, "Hello world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:37:28
@ -45,7 +45,7 @@ help: try this
|
LL - writeln!(v, "{0} {1}", "hello", "world");
LL + writeln!(v, "hello {1}", "world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:37:37
@ -57,7 +57,7 @@ help: try this
|
LL - writeln!(v, "{0} {1}", "hello", "world");
LL + writeln!(v, "{0} world", "hello");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:38:28
@ -69,7 +69,7 @@ help: try this
|
LL - writeln!(v, "{1} {0}", "hello", "world");
LL + writeln!(v, "{1} hello", "world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:38:37
@ -81,7 +81,7 @@ help: try this
|
LL - writeln!(v, "{1} {0}", "hello", "world");
LL + writeln!(v, "world {0}", "hello");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:41:32
@ -93,7 +93,7 @@ help: try this
|
LL - writeln!(v, "{foo} {bar}", foo = "hello", bar = "world");
LL + writeln!(v, "hello {bar}", bar = "world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:41:47
@ -105,7 +105,7 @@ help: try this
|
LL - writeln!(v, "{foo} {bar}", foo = "hello", bar = "world");
LL + writeln!(v, "{foo} world", foo = "hello");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:42:32
@ -117,7 +117,7 @@ help: try this
|
LL - writeln!(v, "{bar} {foo}", foo = "hello", bar = "world");
LL + writeln!(v, "{bar} hello", bar = "world");
|
|
error: literal with an empty format string
--> $DIR/write_literal.rs:42:47
@ -129,7 +129,7 @@ help: try this
|
LL - writeln!(v, "{bar} {foo}", foo = "hello", bar = "world");
LL + writeln!(v, "world {foo}", foo = "hello");
|
|
error: aborting due to 11 previous errors

10
tests/ui/write_literal_2.stderr
View file

@ -9,7 +9,7 @@ help: try this
|
LL - writeln!(v, "{}", "{hello}");
LL + writeln!(v, "{{hello}}");
|
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:10:24
@ -21,7 +21,7 @@ help: try this
|
LL - writeln!(v, r"{}", r"{hello}");
LL + writeln!(v, r"{{hello}}");
|
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:11:23
@ -33,7 +33,7 @@ help: try this
|
LL - writeln!(v, "{}", '/'');
LL + writeln!(v, "'");
|
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:12:23
@ -45,7 +45,7 @@ help: try this
|
LL - writeln!(v, "{}", '"');
LL + writeln!(v, "/"");
|
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:14:24
@ -57,7 +57,7 @@ help: try this
|
LL - writeln!(v, r"{}", '/'');
LL + writeln!(v, r"'");
|
|
error: literal with an empty format string
--> $DIR/write_literal_2.rs:18:9

16
tests/ui/write_with_newline.stderr
View file

@ -9,7 +9,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "Hello/n");
LL + writeln!(v, "Hello");
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:14:5
@ -21,7 +21,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "Hello {}/n", "world");
LL + writeln!(v, "Hello {}", "world");
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:15:5
@ -33,7 +33,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "Hello {} {}/n", "world", "#2");
LL + writeln!(v, "Hello {} {}", "world", "#2");
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:16:5
@ -45,7 +45,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "{}/n", 1265);
LL + writeln!(v, "{}", 1265);
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:17:5
@ -57,7 +57,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "/n");
LL + writeln!(v);
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:36:5
@ -69,7 +69,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "//n"); // should fail
LL + writeln!(v, "/"); // should fail
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:43:5
@ -115,7 +115,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "/r/n"); //~ ERROR
LL + writeln!(v, "/r"); //~ ERROR
|
|
error: using `write!()` with a format string that ends in a single newline
--> $DIR/write_with_newline.rs:58:5
@ -127,7 +127,7 @@ help: use `writeln!()` instead
|
LL - write!(v, "foo/rbar/n");
LL + writeln!(v, "foo/rbar");
|
|
error: aborting due to 10 previous errors