Skip to content

Commit 95708da

Browse files
committed
Update String's new path in clippy tests
1 parent b59f581 commit 95708da

12 files changed

+33
-33
lines changed

src/tools/clippy/tests/ui-toml/await_holding_invalid_type/await_holding_invalid_type.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: holding a disallowed type across an await point `std::string::String`
1+
error: holding a disallowed type across an await point `std::string::string::String`
22
--> tests/ui-toml/await_holding_invalid_type/await_holding_invalid_type.rs:5:9
33
|
44
LL | let _x = String::from("hello");
@@ -14,7 +14,7 @@ error: holding a disallowed type across an await point `std::net::Ipv4Addr`
1414
LL | let x = Ipv4Addr::new(127, 0, 0, 1);
1515
| ^
1616

17-
error: holding a disallowed type across an await point `std::string::String`
17+
error: holding a disallowed type across an await point `std::string::string::String`
1818
--> tests/ui-toml/await_holding_invalid_type/await_holding_invalid_type.rs:33:13
1919
|
2020
LL | let _x = String::from("hi!");
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
await-holding-invalid-types = [
2-
{ path = "std::string::String", reason = "strings are bad" },
2+
{ path = "std::string::string::String", reason = "strings are bad" },
33
"std::net::Ipv4Addr",
44
]

src/tools/clippy/tests/ui/crashes/ice-3969.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ where
4040
fn use_op(s: String) -> String
4141
where
4242
String: ::std::ops::Neg<Output = String>,
43-
//~^ ERROR: trait bound std::string::String: std::ops::Neg does not depend on any type
43+
//~^ ERROR: trait bound std::string::string::String: std::ops::Neg does not depend on any type
4444
{
4545
-s
4646
}

src/tools/clippy/tests/ui/crashes/ice-3969.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ error: trait bound str: std::marker::Sized does not depend on any type or lifeti
1919
LL | str: Sized,
2020
| ^^^^^
2121

22-
error: trait bound std::string::String: std::ops::Neg does not depend on any type or lifetime parameters
22+
error: trait bound std::string::string::String: std::ops::Neg does not depend on any type or lifetime parameters
2323
--> tests/ui/crashes/ice-3969.rs:42:13
2424
|
2525
LL | String: ::std::ops::Neg<Output = String>,

src/tools/clippy/tests/ui/from_over_into.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | impl Into<StringWrapper> for String {
66
|
77
= note: `-D clippy::from-over-into` implied by `-D warnings`
88
= help: to override `-D warnings` add `#[allow(clippy::from_over_into)]`
9-
help: replace the `Into` implementation with `From<std::string::String>`
9+
help: replace the `Into` implementation with `From<std::string::string::String>`
1010
|
1111
LL ~ impl From<String> for StringWrapper {
1212
LL ~ fn from(val: String) -> Self {
@@ -19,7 +19,7 @@ error: an implementation of `From` is preferred since it gives you `Into<_>` for
1919
LL | impl Into<SelfType> for String {
2020
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2121
|
22-
help: replace the `Into` implementation with `From<std::string::String>`
22+
help: replace the `Into` implementation with `From<std::string::string::String>`
2323
|
2424
LL ~ impl From<String> for SelfType {
2525
LL ~ fn from(val: String) -> Self {

src/tools/clippy/tests/ui/from_over_into_unfixable.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error: an implementation of `From` is preferred since it gives you `Into<_>` for
44
LL | impl Into<InMacro> for String {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
66
|
7-
= help: replace the `Into` implementation with `From<std::string::String>`
7+
= help: replace the `Into` implementation with `From<std::string::string::String>`
88
= note: `-D clippy::from-over-into` implied by `-D warnings`
99
= help: to override `-D warnings` add `#[allow(clippy::from_over_into)]`
1010

src/tools/clippy/tests/ui/inefficient_to_string.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ LL | let _: String = rrrstr.to_string();
1919
|
2020
= help: `&&str` implements `ToString` through a slower blanket impl, but `str` has a fast specialization of `ToString`
2121

22-
error: calling `to_string` on `&&std::string::String`
22+
error: calling `to_string` on `&&std::string::string::String`
2323
--> tests/ui/inefficient_to_string.rs:19:21
2424
|
2525
LL | let _: String = rrstring.to_string();
2626
| ^^^^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(*rrstring).to_string()`
2727
|
28-
= help: `&std::string::String` implements `ToString` through a slower blanket impl, but `std::string::String` has a fast specialization of `ToString`
28+
= help: `&std::string::string::String` implements `ToString` through a slower blanket impl, but `std::string::string::String` has a fast specialization of `ToString`
2929

30-
error: calling `to_string` on `&&&std::string::String`
30+
error: calling `to_string` on `&&&std::string::string::String`
3131
--> tests/ui/inefficient_to_string.rs:20:21
3232
|
3333
LL | let _: String = rrrstring.to_string();
3434
| ^^^^^^^^^^^^^^^^^^^^^ help: try dereferencing the receiver: `(**rrrstring).to_string()`
3535
|
36-
= help: `&&std::string::String` implements `ToString` through a slower blanket impl, but `std::string::String` has a fast specialization of `ToString`
36+
= help: `&&std::string::string::String` implements `ToString` through a slower blanket impl, but `std::string::string::String` has a fast specialization of `ToString`
3737

3838
error: calling `to_string` on `&&std::borrow::Cow<'_, str>`
3939
--> tests/ui/inefficient_to_string.rs:28:21

src/tools/clippy/tests/ui/mem_forget.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fn main() {
2828
let string = String::new();
2929
std::mem::forget(string);
3030
//~^ ERROR: usage of `mem::forget` on type with `Drop` fields
31-
//~| NOTE: argument has type `std::string::String`
31+
//~| NOTE: argument has type `std::string::string::String`
3232

3333
std::mem::forget(7);
3434
}

src/tools/clippy/tests/ui/mem_forget.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ error: usage of `mem::forget` on type with `Drop` fields
3030
LL | std::mem::forget(string);
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^
3232
|
33-
= note: argument has type `std::string::String`
33+
= note: argument has type `std::string::string::String`
3434

3535
error: aborting due to 4 previous errors
3636

src/tools/clippy/tests/ui/useless_conversion.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,25 @@ error: useless conversion to the same type: `std::ops::Range<i32>`
5252
LL | let mut n = NUMBERS.into_iter();
5353
| ^^^^^^^^^^^^^^^^^^^ help: consider removing `.into_iter()`: `NUMBERS`
5454

55-
error: useless conversion to the same type: `std::string::String`
55+
error: useless conversion to the same type: `std::string::string::String`
5656
--> tests/ui/useless_conversion.rs:136:21
5757
|
5858
LL | let _: String = "foo".to_string().into();
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: consider removing `.into()`: `"foo".to_string()`
6060

61-
error: useless conversion to the same type: `std::string::String`
61+
error: useless conversion to the same type: `std::string::string::String`
6262
--> tests/ui/useless_conversion.rs:137:21
6363
|
6464
LL | let _: String = From::from("foo".to_string());
6565
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider removing `From::from()`: `"foo".to_string()`
6666

67-
error: useless conversion to the same type: `std::string::String`
67+
error: useless conversion to the same type: `std::string::string::String`
6868
--> tests/ui/useless_conversion.rs:138:13
6969
|
7070
LL | let _ = String::from("foo".to_string());
7171
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider removing `String::from()`: `"foo".to_string()`
7272

73-
error: useless conversion to the same type: `std::string::String`
73+
error: useless conversion to the same type: `std::string::string::String`
7474
--> tests/ui/useless_conversion.rs:139:13
7575
|
7676
LL | let _ = String::from(format!("A: {:04}", 123));
@@ -88,7 +88,7 @@ error: useless conversion to the same type: `std::vec::IntoIter<i32>`
8888
LL | let _ = vec![1, 2, 3].into_iter().into_iter();
8989
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider removing `.into_iter()`: `vec![1, 2, 3].into_iter()`
9090

91-
error: useless conversion to the same type: `std::string::String`
91+
error: useless conversion to the same type: `std::string::string::String`
9292
--> tests/ui/useless_conversion.rs:142:21
9393
|
9494
LL | let _: String = format!("Hello {}", "world").into();

src/tools/clippy/tests/ui/useless_conversion_try.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ fn main() {
3232
let _: String = "foo".try_into().unwrap();
3333
}
3434
let _: String = "foo".to_string().try_into().unwrap();
35-
//~^ ERROR: useless conversion to the same type: `std::string::String`
35+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
3636
let _: String = TryFrom::try_from("foo".to_string()).unwrap();
37-
//~^ ERROR: useless conversion to the same type: `std::string::String`
37+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
3838
let _ = String::try_from("foo".to_string()).unwrap();
39-
//~^ ERROR: useless conversion to the same type: `std::string::String`
39+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
4040
let _ = String::try_from(format!("A: {:04}", 123)).unwrap();
41-
//~^ ERROR: useless conversion to the same type: `std::string::String`
41+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
4242
let _: String = format!("Hello {}", "world").try_into().unwrap();
43-
//~^ ERROR: useless conversion to the same type: `std::string::String`
43+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
4444
let _: String = String::new().try_into().unwrap();
45-
//~^ ERROR: useless conversion to the same type: `std::string::String`
45+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
4646
let _: String = match String::from("_").try_into() {
47-
//~^ ERROR: useless conversion to the same type: `std::string::String`
47+
//~^ ERROR: useless conversion to the same type: `std::string::string::String`
4848
Ok(a) => a,
4949
Err(_) => String::new(),
5050
};

src/tools/clippy/tests/ui/useless_conversion_try.stderr

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,55 +19,55 @@ LL | val.try_into().unwrap()
1919
|
2020
= help: consider removing `.try_into()`
2121

22-
error: useless conversion to the same type: `std::string::String`
22+
error: useless conversion to the same type: `std::string::string::String`
2323
--> tests/ui/useless_conversion_try.rs:34:21
2424
|
2525
LL | let _: String = "foo".to_string().try_into().unwrap();
2626
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2727
|
2828
= help: consider removing `.try_into()`
2929

30-
error: useless conversion to the same type: `std::string::String`
30+
error: useless conversion to the same type: `std::string::string::String`
3131
--> tests/ui/useless_conversion_try.rs:36:21
3232
|
3333
LL | let _: String = TryFrom::try_from("foo".to_string()).unwrap();
3434
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
3535
|
3636
= help: consider removing `TryFrom::try_from()`
3737

38-
error: useless conversion to the same type: `std::string::String`
38+
error: useless conversion to the same type: `std::string::string::String`
3939
--> tests/ui/useless_conversion_try.rs:38:13
4040
|
4141
LL | let _ = String::try_from("foo".to_string()).unwrap();
4242
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4343
|
4444
= help: consider removing `String::try_from()`
4545

46-
error: useless conversion to the same type: `std::string::String`
46+
error: useless conversion to the same type: `std::string::string::String`
4747
--> tests/ui/useless_conversion_try.rs:40:13
4848
|
4949
LL | let _ = String::try_from(format!("A: {:04}", 123)).unwrap();
5050
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5151
|
5252
= help: consider removing `String::try_from()`
5353

54-
error: useless conversion to the same type: `std::string::String`
54+
error: useless conversion to the same type: `std::string::string::String`
5555
--> tests/ui/useless_conversion_try.rs:42:21
5656
|
5757
LL | let _: String = format!("Hello {}", "world").try_into().unwrap();
5858
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5959
|
6060
= help: consider removing `.try_into()`
6161

62-
error: useless conversion to the same type: `std::string::String`
62+
error: useless conversion to the same type: `std::string::string::String`
6363
--> tests/ui/useless_conversion_try.rs:44:21
6464
|
6565
LL | let _: String = String::new().try_into().unwrap();
6666
| ^^^^^^^^^^^^^^^^^^^^^^^^
6767
|
6868
= help: consider removing `.try_into()`
6969

70-
error: useless conversion to the same type: `std::string::String`
70+
error: useless conversion to the same type: `std::string::string::String`
7171
--> tests/ui/useless_conversion_try.rs:46:27
7272
|
7373
LL | let _: String = match String::from("_").try_into() {

0 commit comments

Comments
 (0)