Skip to content

Commit 18bb1a9

Browse files
committed
Update stdlib on_unimplemented attributes and doctests using String to the new path.
Also reverts some UI test changes that were due to on_unimplemented path being wrong.
1 parent 2479837 commit 18bb1a9

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

library/core/src/any.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ impl fmt::Debug for TypeId {
709709
/// ```rust
710710
/// assert_eq!(
711711
/// std::any::type_name::<Option<String>>(),
712-
/// "core::option::Option<alloc::string::String>",
712+
/// "core::option::Option<alloc::string::string::String>",
713713
/// );
714714
/// ```
715715
#[must_use]

library/core/src/convert/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ pub trait Into<T>: Sized {
575575
#[rustc_diagnostic_item = "From"]
576576
#[stable(feature = "rust1", since = "1.0.0")]
577577
#[rustc_on_unimplemented(on(
578-
all(_Self = "&str", T = "alloc::string::String"),
578+
all(_Self = "&str", T = "alloc::string::string::String"),
579579
note = "to coerce a `{T}` into a `{Self}`, use `&*` as a prefix",
580580
))]
581581
#[doc(search_unbox)]

library/core/src/iter/traits/collect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ pub trait FromIterator<A>: Sized {
264264
label = "`{Self}` is not an iterator; try calling `.chars()` or `.bytes()`"
265265
),
266266
on(
267-
_Self = "alloc::string::String",
267+
_Self = "alloc::string::string::String",
268268
label = "`{Self}` is not an iterator; try calling `.chars()` or `.bytes()`"
269269
),
270270
on(

library/core/src/ops/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ see chapter in The Book <https://doc.rust-lang.org/book/ch08-02-strings.html#ind
153153
see chapter in The Book <https://doc.rust-lang.org/book/ch08-02-strings.html#indexing-into-strings>"
154154
),
155155
on(
156-
_Self = "alloc::string::String",
156+
_Self = "alloc::string::string::String",
157157
note = "you can use `.chars().nth()` or `.bytes().nth()`
158158
see chapter in The Book <https://doc.rust-lang.org/book/ch08-02-strings.html#indexing-into-strings>"
159159
),

library/core/src/slice/index.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ mod private_slice_index {
161161
#[rustc_on_unimplemented(
162162
on(T = "str", label = "string indices are ranges of `usize`",),
163163
on(
164-
all(any(T = "str", T = "&str", T = "alloc::string::String"), _Self = "{integer}"),
164+
all(any(T = "str", T = "&str", T = "alloc::string::string::String"), _Self = "{integer}"),
165165
note = "you can use `.chars().nth()` or `.bytes().nth()`\n\
166166
for more information, see chapter 8 in The Book: \
167167
<https://doc.rust-lang.org/book/ch08-02-strings.html#indexing-into-strings>"

0 commit comments

Comments
 (0)