update docs references, fix linkchecker and tests

shua · shua · commit a2a9e297aff7 · 2025-11-25T18:05:14.000+01:00
added some code in linkchecker to check the generic::String docs when
trying to resolve links to alloc::string::String type alias. There's
some lazy-loading that the browser does, but linkchecker doesn't, so
maybe some general-purpose solution would be better, but this seemed
better than a big list of exceptions.
diff --git a/library/core/src/any.rs b/library/core/src/any.rs
@@ -857,7 +857,7 @@ impl fmt::Debug for TypeId {
 /// ```rust
 /// assert_eq!(
 ///     std::any::type_name::<Option<String>>(),
-///     "core::option::Option<alloc::string::String>",
+///     "core::option::Option<alloc::string::generic::String>",
 /// );
 /// ```
 #[must_use]
diff --git a/library/core/src/borrow.rs b/library/core/src/borrow.rs
@@ -43,7 +43,7 @@
 /// [`Box<T>`]: ../../std/boxed/struct.Box.html
 /// [`Mutex<T>`]: ../../std/sync/struct.Mutex.html
 /// [`Rc<T>`]: ../../std/rc/struct.Rc.html
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 /// [`borrow`]: Borrow::borrow
 ///
 /// # Examples
@@ -151,7 +151,7 @@
 ///
 /// [`Hash`]: crate::hash::Hash
 /// [`HashMap<K, V>`]: ../../std/collections/struct.HashMap.html
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_diagnostic_item = "Borrow"]
 #[rustc_const_unstable(feature = "const_convert", issue = "143773")]
diff --git a/library/core/src/char/methods.rs b/library/core/src/char/methods.rs
@@ -86,7 +86,7 @@ impl char {
     /// decoding error.
     ///
     /// It can occur, for example, when giving ill-formed UTF-8 bytes to
-    /// [`String::from_utf8_lossy`](../std/string/struct.String.html#method.from_utf8_lossy).
+    /// [`String::from_utf8_lossy`](../std/string/type.String.html#method.from_utf8_lossy).
     #[stable(feature = "assoc_char_consts", since = "1.52.0")]
     pub const REPLACEMENT_CHARACTER: char = '\u{FFFD}';
 
diff --git a/library/core/src/convert/mod.rs b/library/core/src/convert/mod.rs
@@ -201,7 +201,7 @@ pub const fn identity<T>(x: T) -> T {
 /// [`Borrow`]: crate::borrow::Borrow
 /// [`Eq`]: crate::cmp::Eq
 /// [`Ord`]: crate::cmp::Ord
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 ///
 /// ```
 /// fn is_hello<T: AsRef<str>>(s: T) {
@@ -442,7 +442,7 @@ pub const trait AsMut<T: PointeeSized>: PointeeSized {
 /// is_hello(s);
 /// ```
 ///
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 /// [`Vec`]: ../../std/vec/struct.Vec.html
 #[rustc_diagnostic_item = "Into"]
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -573,7 +573,7 @@ pub const trait Into<T>: Sized {
 /// }
 /// ```
 ///
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 /// [`from`]: From::from
 /// [book]: ../../book/ch09-00-error-handling.html
 #[rustc_diagnostic_item = "From"]
diff --git a/library/core/src/iter/traits/iterator.rs b/library/core/src/iter/traits/iterator.rs
@@ -2006,7 +2006,7 @@ pub trait Iterator {
     /// ```
     ///
     /// [`iter`]: Iterator::next
-    /// [`String`]: ../../std/string/struct.String.html
+    /// [`String`]: ../../std/string/type.String.html
     /// [`char`]: type@char
     #[inline]
     #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/library/core/src/marker.rs b/library/core/src/marker.rs
@@ -450,7 +450,7 @@ marker_impls! {
 ///   while variables captured by mutable reference never implement `Copy`.
 ///
 /// [`Vec<T>`]: ../../std/vec/struct.Vec.html
-/// [`String`]: ../../std/string/struct.String.html
+/// [`String`]: ../../std/string/type.String.html
 /// [`size_of::<T>`]: size_of
 /// [impls]: #implementors
 #[stable(feature = "rust1", since = "1.0.0")]
diff --git a/library/core/src/ops/deref.rs b/library/core/src/ops/deref.rs
@@ -102,7 +102,7 @@ use crate::marker::PointeeSized;
 /// [method resolution]: ../../reference/expressions/method-call-expr.html
 /// [type coercions]: ../../reference/type-coercions.html
 /// [box]: ../../alloc/boxed/struct.Box.html
-/// [string]: ../../alloc/string/struct.String.html
+/// [string]: ../../alloc/string/type.String.html
 /// [vec]: ../../alloc/vec/struct.Vec.html
 /// [rc]: ../../alloc/rc/struct.Rc.html
 /// [cow]: ../../alloc/borrow/enum.Cow.html
@@ -229,7 +229,7 @@ impl<T: ?Sized> const Deref for &mut T {
 /// [method resolution]: ../../reference/expressions/method-call-expr.html
 /// [type coercions]: ../../reference/type-coercions.html
 /// [box]: ../../alloc/boxed/struct.Box.html
-/// [string]: ../../alloc/string/struct.String.html
+/// [string]: ../../alloc/string/type.String.html
 /// [rc]: ../../alloc/rc/struct.Rc.html
 /// [cow]: ../../alloc/borrow/enum.Cow.html
 ///
diff --git a/library/core/src/option.rs b/library/core/src/option.rs
@@ -728,8 +728,8 @@ impl<T> Option<T> {
     /// reference to the value inside the original.
     ///
     /// [`map`]: Option::map
-    /// [String]: ../../std/string/struct.String.html "String"
-    /// [`String`]: ../../std/string/struct.String.html "String"
+    /// [String]: ../../std/string/type.String.html "String"
+    /// [`String`]: ../../std/string/type.String.html "String"
     ///
     /// ```
     /// let text: Option<String> = Some("Hello, world!".to_string());
@@ -1144,7 +1144,7 @@ impl<T> Option<T> {
     /// Calculates the length of an <code>Option<[String]></code> as an
     /// <code>Option<[usize]></code>, consuming the original:
     ///
-    /// [String]: ../../std/string/struct.String.html "String"
+    /// [String]: ../../std/string/type.String.html "String"
     /// ```
     /// let maybe_some_string = Some(String::from("Hello, World!"));
     /// // `Option::map` takes self *by value*, consuming `maybe_some_string`
@@ -2312,7 +2312,7 @@ impl<'a, T> const From<&'a Option<T>> for Option<&'a T> {
     /// to the value inside the original.
     ///
     /// [`map`]: Option::map
-    /// [String]: ../../std/string/struct.String.html "String"
+    /// [String]: ../../std/string/type.String.html "String"
     ///
     /// ```
     /// let s: Option<String> = Some(String::from("Hello, Rustaceans!"));
diff --git a/library/core/src/pin.rs b/library/core/src/pin.rs
@@ -916,7 +916,7 @@
 //! [`Vec::set_len`]: ../../std/vec/struct.Vec.html#method.set_len
 //! [`VecDeque<T>`]: ../../std/collections/struct.VecDeque.html
 //! [VecDeque]: ../../std/collections/struct.VecDeque.html "collections::VecDeque"
-//! [`String`]: ../../std/string/struct.String.html "String"
+//! [`String`]: ../../std/string/type.String.html "String"
 
 #![stable(feature = "pin", since = "1.33.0")]
 
diff --git a/library/core/src/primitive_docs.rs b/library/core/src/primitive_docs.rs
@@ -186,7 +186,7 @@ mod prim_bool {}
 /// because `!` coerces to `Result<!, ConnectionError>` automatically.
 ///
 /// [`String::from_str`]: str::FromStr::from_str
-/// [`String`]: ../std/string/struct.String.html
+/// [`String`]: ../std/string/type.String.html
 /// [`FromStr`]: str::FromStr
 ///
 /// # `!` and traits
@@ -407,7 +407,7 @@ impl ! {}
 /// assert_eq!(5, s.len() * size_of::<u8>());
 /// ```
 ///
-/// [`String`]: ../std/string/struct.String.html
+/// [`String`]: ../std/string/type.String.html
 ///
 /// As always, remember that a human intuition for 'character' might not map to
 /// Unicode's definitions. For example, despite looking similar, the 'é'
diff --git a/library/core/src/str/converts.rs b/library/core/src/str/converts.rs
@@ -25,7 +25,7 @@ use crate::{mem, ptr};
 /// If you need a `String` instead of a `&str`, consider
 /// [`String::from_utf8`][string].
 ///
-/// [string]: ../../std/string/struct.String.html#method.from_utf8
+/// [string]: ../../std/string/type.String.html#method.from_utf8
 ///
 /// Because you can stack-allocate a `[u8; N]`, and you can take a
 /// [`&[u8]`][byteslice] of it, this function is one way to have a
diff --git a/library/core/src/str/error.rs b/library/core/src/str/error.rs
@@ -9,7 +9,7 @@ use crate::fmt;
 /// As such, the `from_utf8` family of functions and methods for both [`String`]s
 /// and [`&str`]s make use of this error, for example.
 ///
-/// [`String`]: ../../std/string/struct.String.html#method.from_utf8
+/// [`String`]: ../../std/string/type.String.html#method.from_utf8
 /// [`&str`]: super::from_utf8
 ///
 /// # Examples
diff --git a/library/core/src/str/lossy.rs b/library/core/src/str/lossy.rs
@@ -179,7 +179,7 @@ impl fmt::Debug for Debug<'_> {
 /// }
 /// ```
 ///
-/// [`String::from_utf8_lossy`]: ../../std/string/struct.String.html#method.from_utf8_lossy
+/// [`String::from_utf8_lossy`]: ../../std/string/type.String.html#method.from_utf8_lossy
 #[must_use = "iterators are lazy and do nothing unless consumed"]
 #[stable(feature = "utf8_chunks", since = "1.79.0")]
 #[derive(Clone)]
diff --git a/library/core/src/str/mod.rs b/library/core/src/str/mod.rs
@@ -181,7 +181,7 @@ impl str {
     /// If you need a `String` instead of a `&str`, consider
     /// [`String::from_utf8`][string].
     ///
-    /// [string]: ../std/string/struct.String.html#method.from_utf8
+    /// [string]: ../std/string/type.String.html#method.from_utf8
     ///
     /// Because you can stack-allocate a `[u8; N]`, and you can take a
     /// [`&[u8]`][byteslice] of it, this function is one way to have a
diff --git a/library/core/src/task/poll.rs b/library/core/src/task/poll.rs
@@ -35,7 +35,7 @@ impl<T> Poll<T> {
     /// Converts a <code>Poll<[String]></code> into a <code>Poll<[usize]></code>, consuming
     /// the original:
     ///
-    /// [String]: ../../std/string/struct.String.html "String"
+    /// [String]: ../../std/string/type.String.html "String"
     /// ```
     /// # use core::task::Poll;
     /// let poll_some_string = Poll::Ready(String::from("Hello, World!"));
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs
@@ -69,7 +69,7 @@ impl<'a> PanicHookInfo<'a> {
     /// (or, in Rust 2018 and earlier, `panic!(x)` where `x` is something other than a string)
     /// can result in a panic payload other than a `&'static str` or `String`.
     ///
-    /// [`String`]: ../../std/string/struct.String.html
+    /// [`String`]: crate::string::generic::String
     /// [`payload_as_str`]: PanicHookInfo::payload_as_str
     ///
     /// # Examples
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
@@ -423,6 +423,25 @@ impl Checker {
                 return;
             }
 
+            // String is now a type alias to alloc::string::generic::String<Global>
+            // as such, the docs page dynamically includes all the methods from the target struct
+            // linkchecker normally doesn't load these, but we hack it here.
+            if path.ends_with("alloc/string/type.String.html")
+                || path.ends_with("std/string/type.String.html")
+            {
+                let mut struct_file = path.clone();
+                struct_file.pop();
+                struct_file.push("generic/struct.String.html");
+                if let (_, FileEntry::HtmlFile { ids, source }) =
+                    self.load_file(&struct_file, report)
+                {
+                    parse_ids(&mut ids.borrow_mut(), &pretty_path, source, report);
+                    if ids.borrow().contains(*fragment) {
+                        return;
+                    }
+                }
+            }
+
             if is_exception(file, &format!("#{}", fragment)) {
                 report.links_ignored_exception += 1;
             } else {
diff --git a/src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs b/src/tools/rust-analyzer/crates/ide-db/src/generated/lints.rs
@@ -10793,7 +10793,7 @@ pub fn is_it_the_answer(value: Value) -> bool {
 }
 ```
 
-[its `Deref` implementation]: https://doc.rust-lang.org/std/string/struct.String.html#impl-Deref-for-String
+[its `Deref` implementation]: https://doc.rust-lang.org/std/string/type.String.html#impl-Deref-for-String
 "##,
         default_severity: Severity::Allow,
         warn_since: None,
diff --git a/tests/rustdoc-js-std/basic.js b/tests/rustdoc-js-std/basic.js
@@ -9,6 +9,6 @@ const EXPECTED = {
         { 'path': 'std::str', 'name': 'eq' },
     ],
     'returned': [
-        { 'path': 'std::string::String', 'name': 'new' },
+        { 'path': 'std::string::generic::String', 'name': 'new' },
     ],
 };
diff --git a/tests/rustdoc-js-std/from_u.js b/tests/rustdoc-js-std/from_u.js
@@ -3,6 +3,6 @@ const EXPECTED = {
     'others': [
         { 'path': 'std::char', 'name': 'from_u32' },
         { 'path': 'std::str', 'name': 'from_utf8' },
-        { 'path': 'std::string::String', 'name': 'from_utf8' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf8' },
     ],
 };
diff --git a/tests/rustdoc-js-std/return-specific-literal.js b/tests/rustdoc-js-std/return-specific-literal.js
@@ -1,9 +1,9 @@
 const EXPECTED = {
     'query': 'struct:"string"',
     'in_args': [
-        { 'path': 'std::string::String', 'name': 'ne' },
+        { 'path': 'std::string::generic::String', 'name': 'ne' },
     ],
     'returned': [
-        { 'path': 'std::string::String', 'name': 'new' },
+        { 'path': 'std::string::generic::String', 'name': 'new' },
     ],
 };
diff --git a/tests/rustdoc-js-std/return-specific.js b/tests/rustdoc-js-std/return-specific.js
@@ -1,9 +1,9 @@
 const EXPECTED = {
     'query': 'struct:string',
     'in_args': [
-        { 'path': 'std::string::String', 'name': 'ne' },
+        { 'path': 'std::string::generic::String', 'name': 'ne' },
     ],
     'returned': [
-        { 'path': 'std::string::String', 'name': 'new' },
+        { 'path': 'std::string::generic::String', 'name': 'new' },
     ],
 };
diff --git a/tests/rustdoc-js-std/string-from_ut.js b/tests/rustdoc-js-std/string-from_ut.js
@@ -1,10 +1,10 @@
 const EXPECTED = {
     'query': 'String::from_ut',
     'others': [
-        { 'path': 'std::string::String', 'name': 'from_utf8' },
-        { 'path': 'std::string::String', 'name': 'from_utf8' },
-        { 'path': 'std::string::String', 'name': 'from_utf8_lossy' },
-        { 'path': 'std::string::String', 'name': 'from_utf16_lossy' },
-        { 'path': 'std::string::String', 'name': 'from_utf8_unchecked' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf8' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf8' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf8_lossy' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf16_lossy' },
+        { 'path': 'std::string::generic::String', 'name': 'from_utf8_unchecked' },
     ],
 };
diff --git a/tests/rustdoc-ui/intra-doc/empty-associated-items.stderr b/tests/rustdoc-ui/intra-doc/empty-associated-items.stderr
@@ -2,7 +2,7 @@ error: unresolved link to `String::`
   --> $DIR/empty-associated-items.rs:6:7
    |
 LL | /// [`String::`]
-   |       ^^^^^^^^ the struct `String` has no field or associated item named ``
+   |       ^^^^^^^^ the type alias `String` has no associated item named ``
    |
 note: the lint level is defined here
   --> $DIR/empty-associated-items.rs:4:8
diff --git a/tests/rustdoc/decl-trailing-whitespace.declaration.html b/tests/rustdoc/decl-trailing-whitespace.declaration.html
@@ -2,16 +2,16 @@
     // Required methods
     fn <a href="#tymethod.poll_write" class="fn">poll_write</a>(
         self,
-        cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="{{channel}}/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;,
+        cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="type" href="{{channel}}/alloc/string/type.String.html" title="type alloc::string::String">String</a>&gt;,
         buf: &amp;mut [<a class="primitive" href="{{channel}}/std/primitive.usize.html">usize</a>],
     ) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.usize.html">usize</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt;;
-<span class="item-spacer" />    fn <a href="#tymethod.poll_flush" class="fn">poll_flush</a>(self, cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="{{channel}}/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt;;
-<span class="item-spacer" />    fn <a href="#tymethod.poll_close" class="fn">poll_close</a>(self, cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="{{channel}}/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt;;
+<span class="item-spacer" />    fn <a href="#tymethod.poll_flush" class="fn">poll_flush</a>(self, cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="type" href="{{channel}}/alloc/string/type.String.html" title="type alloc::string::String">String</a>&gt;) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt;;
+<span class="item-spacer" />    fn <a href="#tymethod.poll_close" class="fn">poll_close</a>(self, cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="type" href="{{channel}}/alloc/string/type.String.html" title="type alloc::string::String">String</a>&gt;) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.unit.html">()</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt;;
 
     // Provided method
     fn <a href="#method.poll_write_vectored" class="fn">poll_write_vectored</a>(
         self,
-        cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="{{channel}}/alloc/string/struct.String.html" title="struct alloc::string::String">String</a>&gt;,
+        cx: &amp;mut <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="type" href="{{channel}}/alloc/string/type.String.html" title="type alloc::string::String">String</a>&gt;,
         bufs: &amp;[<a class="primitive" href="{{channel}}/std/primitive.usize.html">usize</a>],
     ) -&gt; <a class="enum" href="{{channel}}/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="enum" href="{{channel}}/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="{{channel}}/std/primitive.usize.html">usize</a>, <a class="struct" href="struct.Error.html" title="struct foo::Error">Error</a>&gt;&gt; { ... }
 }</code>
diff --git a/tests/rustdoc/intra-doc/associated-items.rs b/tests/rustdoc/intra-doc/associated-items.rs
@@ -4,7 +4,7 @@
 /// [`String::from`] is ambiguous as to which `From` impl
 /// [Vec::into_iter()] uses a disambiguator
 //@ has 'associated_items/fn.foo.html' '//a[@href="{{channel}}/alloc/collections/btree/map/struct.BTreeMap.html#method.into_iter"]' 'std::collections::BTreeMap::into_iter'
-//@ has 'associated_items/fn.foo.html' '//a[@href="{{channel}}/alloc/string/struct.String.html#method.from"]' 'String::from'
+//@ has 'associated_items/fn.foo.html' '//a[@href="{{channel}}/alloc/string/generic/struct.String.html#method.from"]' 'String::from'
 //@ has 'associated_items/fn.foo.html' '//a[@href="{{channel}}/alloc/vec/struct.Vec.html#method.into_iter"]' 'Vec::into_iter'
 pub fn foo() {}
 
diff --git a/tests/rustdoc/masked.rs b/tests/rustdoc/masked.rs
@@ -9,9 +9,9 @@ extern crate masked;
 
 //@ !hasraw 'search.index/name/*.js' 'masked_method'
 
-//@ !hasraw 'foo/struct.String.html' 'MaskedTrait'
-//@ !hasraw 'foo/struct.String.html' 'MaskedBlanketTrait'
-//@ !hasraw 'foo/struct.String.html' 'masked_method'
+//@ !hasraw 'foo/type.String.html' 'MaskedTrait'
+//@ !hasraw 'foo/type.String.html' 'MaskedBlanketTrait'
+//@ !hasraw 'foo/type.String.html' 'masked_method'
 pub use std::string::String;
 
 //@ !hasraw 'foo/trait.Clone.html' 'MaskedStruct'
diff --git a/tests/rustdoc/source-code-pages/check-source-code-urls-to-def.rs b/tests/rustdoc/source-code-pages/check-source-code-urls-to-def.rs
@@ -28,7 +28,7 @@ impl Foo {
 
 fn babar() {}
 
-//@ has - '//pre[@class="rust"]//a/@href' '/struct.String.html'
+//@ has - '//pre[@class="rust"]//a/@href' '/type.String.html'
 //@ has - '//pre[@class="rust"]//a/@href' '/primitive.u32.html'
 //@ has - '//pre[@class="rust"]//a/@href' '/primitive.str.html'
 // The 5 links to line 23 and the line 23 itself.
