rustdoc: percent-encode URL fragments

Jules-Bertholet · Jules-Bertholet · commit a9d7027f3986 · 2026-04-15T22:32:07.000-04:00
diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs
@@ -582,6 +582,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for HeadingLinks<'a, '_,
                 }
             }
             let id = self.id_map.derive(id);
+            let percent_encoded_id = small_url_encode(id.clone());
 
             if let Some(ref mut builder) = self.toc {
                 let mut text_header = String::new();
@@ -596,8 +597,9 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for HeadingLinks<'a, '_,
                 std::cmp::min(level as u32 + (self.heading_offset as u32), MAX_HEADER_LEVEL);
             self.buf.push_back((Event::Html(format!("</h{level}>").into()), 0..0));
 
-            let start_tags =
-                format!("<h{level} id=\"{id}\"><a class=\"doc-anchor\" href=\"#{id}\">§</a>");
+            let start_tags = format!(
+                "<h{level} id=\"{id}\"><a class=\"doc-anchor\" href=\"#{percent_encoded_id}\">§</a>"
+            );
             return Some((Event::Html(start_tags.into()), 0..0));
         }
         event
diff --git a/tests/rustdoc-html/unicode.rs b/tests/rustdoc-html/unicode.rs
@@ -0,0 +1,10 @@
+#![crate_name = "unicode"]
+
+pub struct Foo;
+
+impl Foo {
+    //@ has unicode/struct.Foo.html //a/@href "#%C3%BA"
+    //@ !has unicode/struct.Foo.html //a/@href "#ú"
+    /// # ú
+    pub fn foo() {}
+}

Original file line number	Diff line number	Diff line change
`@@ -582,6 +582,7 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for HeadingLinks<'a, '_,`
`582`	`582`	`}`
`583`	`583`	`}`
`584`	`584`	`let id = self.id_map.derive(id);`
	`585`	`+ let percent_encoded_id = small_url_encode(id.clone());`
`585`	`586`
`586`	`587`	`if let Some(ref mut builder) = self.toc {`
`587`	`588`	`let mut text_header = String::new();`
`@@ -596,8 +597,9 @@ impl<'a, I: Iterator<Item = SpannedEvent<'a>>> Iterator for HeadingLinks<'a, '_,`
`596`	`597`	`std::cmp::min(level as u32 + (self.heading_offset as u32), MAX_HEADER_LEVEL);`
`597`	`598`	`self.buf.push_back((Event::Html(format!("</h{level}>").into()), 0..0));`
`598`	`599`
`599`		`- let start_tags =`
`600`		`- format!("<h{level} id=\"{id}\"><a class=\"doc-anchor\" href=\"#{id}\">§</a>");`
	`600`	`+ let start_tags = format!(`
	`601`	`+ "<h{level} id=\"{id}\"><a class=\"doc-anchor\" href=\"#{percent_encoded_id}\">§</a>"`
	`602`	`+ );`
`601`	`603`	`return Some((Event::Html(start_tags.into()), 0..0));`
`602`	`604`	`}`
`603`	`605`	`event`