Auto merge of #102331 - notriddle:rollup-dmefd2d, r=notriddle

bors · bors · commit cd4d9d934fd3 · 2022-09-27T01:58:36.000Z
Rollup of 6 pull requests Successful merges: - #102283 (Improve code example for Option::unwrap_or_default) - #102319 (rustdoc: merge CSS `table` rules into `.docblock`) - #102321 ( Rustdoc-Json: List impls for primitives) - #102322 (Document that Display automatically implements ToString) - #102325 (rustdoc: give `.line-number` / `.line-numbers` meaningful names) - #102326 (rustdoc: Update doc comment for splitn_mut to include mutable in the …) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/library/core/src/fmt/mod.rs b/library/core/src/fmt/mod.rs
@@ -709,12 +709,19 @@ pub use macros::Debug;
 
 /// Format trait for an empty format, `{}`.
 ///
+/// Implementing this trait for a type will automatically implement the
+/// [`ToString`][tostring] trait for the type, allowing the usage
+/// of the [`.to_string()`][tostring_function] method. Prefer implementing
+/// the `Display` trait for a type, rather than [`ToString`][tostring].
+///
 /// `Display` is similar to [`Debug`], but `Display` is for user-facing
 /// output, and so cannot be derived.
 ///
 /// For more information on formatters, see [the module-level documentation][module].
 ///
 /// [module]: ../../std/fmt/index.html
+/// [tostring]: ../../std/string/trait.ToString.html
+/// [tostring_function]: ../../std/string/trait.ToString.html#tymethod.to_string
 ///
 /// # Examples
 ///
diff --git a/library/core/src/slice/mod.rs b/library/core/src/slice/mod.rs
@@ -2076,7 +2076,7 @@ impl<T> [T] {
         SplitN::new(self.split(pred), n)
     }
 
-    /// Returns an iterator over subslices separated by elements that match
+    /// Returns an iterator over mutable subslices separated by elements that match
     /// `pred`, limited to returning at most `n` items. The matched element is
     /// not contained in the subslices.
     ///
diff --git a/src/librustdoc/html/sources.rs b/src/librustdoc/html/sources.rs
@@ -274,7 +274,7 @@ pub(crate) fn print_src(
 ) {
     let lines = s.lines().count();
     let mut line_numbers = Buffer::empty_from(buf);
-    line_numbers.write_str("<pre class=\"line-numbers\">");
+    line_numbers.write_str("<pre class=\"src-line-numbers\">");
     match source_context {
         SourceContext::Standalone => {
             for line in 1..=lines {
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
@@ -299,15 +299,6 @@ summary {
 
 /* Fix some style changes due to normalize.css 8 */
 
-td,
-th {
-	padding: 0;
-}
-
-table {
-	border-collapse: collapse;
-}
-
 button,
 input,
 optgroup,
@@ -578,7 +569,7 @@ h2.location a {
 	position: relative;
 }
 
-.example-wrap > pre.line-number {
+pre.example-line-numbers {
 	overflow: initial;
 	border: 1px solid;
 	padding: 13px 8px;
@@ -591,15 +582,15 @@ h2.location a {
 	text-decoration: underline;
 }
 
-.line-numbers {
+.src-line-numbers {
 	text-align: right;
 }
-.rustdoc:not(.source) .example-wrap > pre:not(.line-number) {
+.rustdoc:not(.source) .example-wrap > pre:not(.example-line-numbers) {
 	width: 100%;
 	overflow-x: auto;
 }
 
-.rustdoc:not(.source) .example-wrap > pre.line-numbers {
+.rustdoc:not(.source) .example-wrap > pre.src-line-numbers {
 	width: auto;
 	overflow-x: visible;
 }
@@ -612,14 +603,14 @@ h2.location a {
 	text-align: center;
 }
 
-.content > .example-wrap pre.line-numbers {
+.content > .example-wrap pre.src-line-numbers {
 	position: relative;
 	-webkit-user-select: none;
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
 }
-.line-numbers span {
+.src-line-numbers span {
 	cursor: pointer;
 }
 
@@ -695,6 +686,7 @@ pre, .rustdoc.source .example-wrap {
 	width: calc(100% - 2px);
 	overflow-x: auto;
 	display: block;
+	border-collapse: collapse;
 }
 
 .docblock table td {
@@ -2067,7 +2059,7 @@ in storage.js plus the media query with (min-width: 701px)
 	padding-bottom: 0;
 }
 
-.scraped-example:not(.expanded) .code-wrapper pre.line-numbers {
+.scraped-example:not(.expanded) .code-wrapper pre.src-line-numbers {
 	overflow-x: hidden;
 }
 
@@ -2113,12 +2105,12 @@ in storage.js plus the media query with (min-width: 701px)
 	bottom: 0;
 }
 
-.scraped-example .code-wrapper .line-numbers {
+.scraped-example .code-wrapper .src-line-numbers {
 	margin: 0;
 	padding: 14px 0;
 }
 
-.scraped-example .code-wrapper .line-numbers span {
+.scraped-example .code-wrapper .src-line-numbers span {
 	padding: 0 14px;
 }
 
diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css
@@ -93,8 +93,8 @@ pre, .rustdoc.source .example-wrap {
 	color: #ff7733;
 }
 
-.line-numbers span { color: #5c6773; }
-.line-numbers .line-highlighted {
+.src-line-numbers span { color: #5c6773; }
+.src-line-numbers .line-highlighted {
 	color: #708090;
 	background-color: rgba(255, 236, 164, 0.06);
 	padding-right: 4px;
@@ -171,7 +171,7 @@ details.rustdoc-toggle > summary::before {
 	color: #788797;
 }
 
-.line-numbers :target { background-color: transparent; }
+.src-line-numbers :target { background-color: transparent; }
 
 /* Code highlighting */
 pre.rust .number, pre.rust .string { color: #b8cc52; }
@@ -190,7 +190,7 @@ pre.rust .attribute {
 	color: #e6e1cf;
 }
 
-.example-wrap > pre.line-number {
+pre.example-line-numbers {
 	color: #5c67736e;
 	border: none;
 }
diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css
@@ -54,8 +54,8 @@ input:focus + .slider {
 	background: #444;
 }
 
-.line-numbers span { color: #3B91E2; }
-.line-numbers .line-highlighted {
+.src-line-numbers span { color: #3B91E2; }
+.src-line-numbers .line-highlighted {
 	background-color: #0a042f !important;
 }
 
@@ -141,7 +141,7 @@ details.rustdoc-toggle > summary::before {
 	background: none;
 }
 
-.line-numbers :target { background-color: transparent; }
+.src-line-numbers :target { background-color: transparent; }
 
 /* Code highlighting */
 pre.rust .kw { color: #ab8ac1; }
@@ -155,7 +155,7 @@ pre.rust .question-mark {
 	color: #ff9011;
 }
 
-.example-wrap > pre.line-number {
+pre.example-line-numbers {
 	border-color: #4a4949;
 }
 
diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css
@@ -53,8 +53,8 @@ input:focus + .slider {
 	background-color: #fff;
 }
 
-.line-numbers span { color: #c67e2d; }
-.line-numbers .line-highlighted {
+.src-line-numbers span { color: #c67e2d; }
+.src-line-numbers .line-highlighted {
 	background-color: #FDFFD3 !important;
 }
 
@@ -125,7 +125,7 @@ body.source .example-wrap pre.rust a {
 .stab { background: #FFF5D6; border-color: #FFC600; }
 .stab.portability > code { background: none; }
 
-.line-numbers :target { background-color: transparent; }
+.src-line-numbers :target { background-color: transparent; }
 
 /* Code highlighting */
 pre.rust .kw { color: #8959A8; }
@@ -141,7 +141,7 @@ pre.rust .question-mark {
 	color: #ff9011;
 }
 
-.example-wrap > pre.line-number {
+pre.example-line-numbers {
 	border-color: #c7c7c7;
 }
 
diff --git a/src/librustdoc/html/static/js/main.js b/src/librustdoc/html/static/js/main.js
@@ -699,7 +699,7 @@ function loadCss(cssFileName) {
     window.rustdoc_add_line_numbers_to_examples = () => {
         onEachLazy(document.getElementsByClassName("rust-example-rendered"), x => {
             const parent = x.parentNode;
-            const line_numbers = parent.querySelectorAll(".line-number");
+            const line_numbers = parent.querySelectorAll(".example-line-numbers");
             if (line_numbers.length > 0) {
                 return;
             }
@@ -709,7 +709,7 @@ function loadCss(cssFileName) {
                 elems.push(i + 1);
             }
             const node = document.createElement("pre");
-            addClass(node, "line-number");
+            addClass(node, "example-line-numbers");
             node.innerHTML = elems.join("\n");
             parent.insertBefore(node, x);
         });
@@ -718,7 +718,7 @@ function loadCss(cssFileName) {
     window.rustdoc_remove_line_numbers_from_examples = () => {
         onEachLazy(document.getElementsByClassName("rust-example-rendered"), x => {
             const parent = x.parentNode;
-            const line_numbers = parent.querySelectorAll(".line-number");
+            const line_numbers = parent.querySelectorAll(".example-line-numbers");
             for (const node of line_numbers) {
                 parent.removeChild(node);
             }
diff --git a/src/librustdoc/html/static/js/scrape-examples.js b/src/librustdoc/html/static/js/scrape-examples.js
@@ -8,7 +8,7 @@
 
     // Scroll code block to the given code location
     function scrollToLoc(elt, loc) {
-        const lines = elt.querySelector(".line-numbers");
+        const lines = elt.querySelector(".src-line-numbers");
         let scrollOffset;
 
         // If the block is greater than the size of the viewer,
diff --git a/src/librustdoc/html/static/js/source-script.js b/src/librustdoc/html/static/js/source-script.js
@@ -183,7 +183,7 @@ function highlightSourceLines(match) {
     if (x) {
         x.scrollIntoView();
     }
-    onEachLazy(document.getElementsByClassName("line-numbers"), e => {
+    onEachLazy(document.getElementsByClassName("src-line-numbers"), e => {
         onEachLazy(e.getElementsByTagName("span"), i_e => {
             removeClass(i_e, "line-highlighted");
         });
@@ -245,7 +245,7 @@ window.addEventListener("hashchange", () => {
     }
 });
 
-onEachLazy(document.getElementsByClassName("line-numbers"), el => {
+onEachLazy(document.getElementsByClassName("src-line-numbers"), el => {
     el.addEventListener("click", handleSourceHighlight);
 });
 
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
@@ -272,7 +272,12 @@ fn from_clean_item(item: clean::Item, tcx: TyCtxt<'_>) -> ItemEnum {
         ConstantItem(c) => ItemEnum::Constant(c.into_tcx(tcx)),
         MacroItem(m) => ItemEnum::Macro(m.source),
         ProcMacroItem(m) => ItemEnum::ProcMacro(m.into_tcx(tcx)),
-        PrimitiveItem(p) => ItemEnum::PrimitiveType(p.as_sym().to_string()),
+        PrimitiveItem(p) => {
+            ItemEnum::Primitive(Primitive {
+                name: p.as_sym().to_string(),
+                impls: Vec::new(), // Added in JsonRenderer::item
+            })
+        }
         TyAssocConstItem(ty) => ItemEnum::AssocConst { type_: ty.into_tcx(tcx), default: None },
         AssocConstItem(ty, default) => {
             ItemEnum::AssocConst { type_: ty.into_tcx(tcx), default: Some(default.expr(tcx)) }
diff --git a/src/librustdoc/json/mod.rs b/src/librustdoc/json/mod.rs
@@ -219,12 +219,15 @@ impl<'tcx> FormatRenderer<'tcx> for JsonRenderer<'tcx> {
                     u.impls = self.get_impls(item_id.expect_def_id());
                     false
                 }
+                types::ItemEnum::Primitive(ref mut p) => {
+                    p.impls = self.get_impls(item_id.expect_def_id());
+                    false
+                }
 
                 types::ItemEnum::Method(_)
                 | types::ItemEnum::Module(_)
                 | types::ItemEnum::AssocConst { .. }
-                | types::ItemEnum::AssocType { .. }
-                | types::ItemEnum::PrimitiveType(_) => true,
+                | types::ItemEnum::AssocType { .. } => true,
                 types::ItemEnum::ExternCrate { .. }
                 | types::ItemEnum::Import(_)
                 | types::ItemEnum::StructField(_)
diff --git a/src/rustdoc-json-types/lib.rs b/src/rustdoc-json-types/lib.rs
@@ -9,7 +9,7 @@ use std::path::PathBuf;
 use serde::{Deserialize, Serialize};
 
 /// rustdoc format-version.
-pub const FORMAT_VERSION: u32 = 21;
+pub const FORMAT_VERSION: u32 = 22;
 
 /// A `Crate` is the root of the emitted JSON blob. It contains all type/documentation information
 /// about the language items in the local crate, as well as info about external items to allow
@@ -254,7 +254,7 @@ pub enum ItemEnum {
     Macro(String),
     ProcMacro(ProcMacro),
 
-    PrimitiveType(String),
+    Primitive(Primitive),
 
     AssocConst {
         #[serde(rename = "type")]
@@ -709,5 +709,11 @@ pub struct Static {
     pub expr: String,
 }
 
+#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub struct Primitive {
+    pub name: String,
+    pub impls: Vec<Id>,
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs b/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs
@@ -1,8 +1,8 @@
 // Scraped example should only include line numbers for items b and c in ex.rs
-// @!has foobar/fn.f.html '//*[@class="line-numbers"]' '14'
-// @has foobar/fn.f.html '//*[@class="line-numbers"]' '15'
-// @has foobar/fn.f.html '//*[@class="line-numbers"]' '21'
-// @!has foobar/fn.f.html '//*[@class="line-numbers"]' '22'
+// @!has foobar/fn.f.html '//*[@class="src-line-numbers"]' '14'
+// @has foobar/fn.f.html '//*[@class="src-line-numbers"]' '15'
+// @has foobar/fn.f.html '//*[@class="src-line-numbers"]' '21'
+// @!has foobar/fn.f.html '//*[@class="src-line-numbers"]' '22'
 
 pub fn f() {}
 
diff --git a/src/test/rustdoc-gui/basic-code.goml b/src/test/rustdoc-gui/basic-code.goml
@@ -1,3 +1,3 @@
 goto: file://|DOC_PATH|/test_docs/index.html
 click: ".srclink"
-assert-count: (".line-numbers", 1)
+assert-count: (".src-line-numbers", 1)
diff --git a/src/test/rustdoc-gui/docblock-code-block-line-number.goml b/src/test/rustdoc-gui/docblock-code-block-line-number.goml
@@ -2,24 +2,24 @@
 goto: file://|DOC_PATH|/test_docs/fn.foo.html
 
 // We check that without this setting, there is no line number displayed.
-assert-false: "pre.line-number"
+assert-false: "pre.example-line-numbers"
 
 // We now set the setting to show the line numbers on code examples.
 local-storage: {"rustdoc-line-numbers": "true" }
 // We reload to make the line numbers appear.
 reload:
 
 // We wait for them to be added into the DOM by the JS...
-wait-for: "pre.line-number"
+wait-for: "pre.example-line-numbers"
 // If the test didn't fail, it means that it was found!
 // Let's now check some CSS properties...
-assert-css: ("pre.line-number", {
+assert-css: ("pre.example-line-numbers", {
     "margin": "0px",
     "padding": "13px 8px",
     "text-align": "right",
 })
 // The first code block has two lines so let's check its `<pre>` elements lists both of them.
-assert-text: ("pre.line-number", "1\n2")
+assert-text: ("pre.example-line-numbers", "1\n2")
 
 // Now, try changing the setting dynamically. We'll turn it off, using the settings menu,
 // and make sure it goes away.
@@ -32,8 +32,8 @@ assert-css: ("#settings", {"display": "block"})
 // Then, click the toggle button.
 click: "input#line-numbers + .slider"
 wait-for: 100 // wait-for-false does not exist
-assert-false: "pre.line-number"
+assert-false: "pre.example-line-numbers"
 
 // Finally, turn it on again.
 click: "input#line-numbers + .slider"
-wait-for: "pre.line-number"
+wait-for: "pre.example-line-numbers"
diff --git a/src/test/rustdoc-gui/source-code-page.goml b/src/test/rustdoc-gui/source-code-page.goml
diff --git a/src/test/rustdoc-json/primitives/primitive_impls.rs b/src/test/rustdoc-json/primitives/primitive_impls.rs
diff --git a/src/test/rustdoc-json/primitives/primitive_overloading.rs b/src/test/rustdoc-json/primitives/primitive_overloading.rs
diff --git a/src/test/rustdoc-json/primitives/primitive_type.rs b/src/test/rustdoc-json/primitives/primitive_type.rs
diff --git a/src/test/rustdoc-json/primitives/use_primitive.rs b/src/test/rustdoc-json/primitives/use_primitive.rs
diff --git a/src/tools/jsondoclint/src/item_kind.rs b/src/tools/jsondoclint/src/item_kind.rs
diff --git a/src/tools/jsondoclint/src/validator.rs b/src/tools/jsondoclint/src/validator.rs

Original file line number	Diff line number	Diff line change
`@@ -2076,7 +2076,7 @@ impl<T> [T] {`
`2076`	`2076`	`SplitN::new(self.split(pred), n)`
`2077`	`2077`	`}`
`2078`	`2078`
`2079`		`- /// Returns an iterator over subslices separated by elements that match`
	`2079`	`+ /// Returns an iterator over mutable subslices separated by elements that match`
`2080`	`2080`	/// `pred`, limited to returning at most `n` items. The matched element is
`2081`	`2081`	`/// not contained in the subslices.`
`2082`	`2082`	`///`
Original file line number	Diff line number	Diff line change
`@@ -299,15 +299,6 @@ summary {`
`299`	`299`
`300`	`300`	`/* Fix some style changes due to normalize.css 8 */`
`301`	`301`
`302`		`-td,`
`303`		`-th {`
`304`		`- padding: 0;`
`305`		`-}`
`306`		`-`
`307`		`-table {`
`308`		`- border-collapse: collapse;`
`309`		`-}`
`310`		`-`
`311`	`302`	`button,`
`312`	`303`	`input,`
`313`	`304`	`optgroup,`
`@@ -578,7 +569,7 @@ h2.location a {`
`578`	`569`	`position: relative;`
`579`	`570`	`}`
`580`	`571`
`581`		`-.example-wrap > pre.line-number {`
	`572`	`+pre.example-line-numbers {`
`582`	`573`	`overflow: initial;`
`583`	`574`	`border: 1px solid;`
`584`	`575`	`padding: 13px 8px;`
`@@ -591,15 +582,15 @@ h2.location a {`
`591`	`582`	`text-decoration: underline;`
`592`	`583`	`}`
`593`	`584`
`594`		`-.line-numbers {`
	`585`	`+.src-line-numbers {`
`595`	`586`	`text-align: right;`
`596`	`587`	`}`
`597`		`-.rustdoc:not(.source) .example-wrap > pre:not(.line-number) {`
	`588`	`+.rustdoc:not(.source) .example-wrap > pre:not(.example-line-numbers) {`
`598`	`589`	`width: 100%;`
`599`	`590`	`overflow-x: auto;`
`600`	`591`	`}`
`601`	`592`
`602`		`-.rustdoc:not(.source) .example-wrap > pre.line-numbers {`
	`593`	`+.rustdoc:not(.source) .example-wrap > pre.src-line-numbers {`
`603`	`594`	`width: auto;`
`604`	`595`	`overflow-x: visible;`
`605`	`596`	`}`
`@@ -612,14 +603,14 @@ h2.location a {`
`612`	`603`	`text-align: center;`
`613`	`604`	`}`
`614`	`605`
`615`		`-.content > .example-wrap pre.line-numbers {`
	`606`	`+.content > .example-wrap pre.src-line-numbers {`
`616`	`607`	`position: relative;`
`617`	`608`	`-webkit-user-select: none;`
`618`	`609`	`-moz-user-select: none;`
`619`	`610`	`-ms-user-select: none;`
`620`	`611`	`user-select: none;`
`621`	`612`	`}`
`622`		`-.line-numbers span {`
	`613`	`+.src-line-numbers span {`
`623`	`614`	`cursor: pointer;`
`624`	`615`	`}`
`625`	`616`
`@@ -695,6 +686,7 @@ pre, .rustdoc.source .example-wrap {`
`695`	`686`	`width: calc(100% - 2px);`
`696`	`687`	`overflow-x: auto;`
`697`	`688`	`display: block;`
	`689`	`+ border-collapse: collapse;`
`698`	`690`	`}`
`699`	`691`
`700`	`692`	`.docblock table td {`
`@@ -2067,7 +2059,7 @@ in storage.js plus the media query with (min-width: 701px)`
`2067`	`2059`	`padding-bottom: 0;`
`2068`	`2060`	`}`
`2069`	`2061`
`2070`		`-.scraped-example:not(.expanded) .code-wrapper pre.line-numbers {`
	`2062`	`+.scraped-example:not(.expanded) .code-wrapper pre.src-line-numbers {`
`2071`	`2063`	`overflow-x: hidden;`
`2072`	`2064`	`}`
`2073`	`2065`
`@@ -2113,12 +2105,12 @@ in storage.js plus the media query with (min-width: 701px)`
`2113`	`2105`	`bottom: 0;`
`2114`	`2106`	`}`
`2115`	`2107`
`2116`		`-.scraped-example .code-wrapper .line-numbers {`
	`2108`	`+.scraped-example .code-wrapper .src-line-numbers {`
`2117`	`2109`	`margin: 0;`
`2118`	`2110`	`padding: 14px 0;`
`2119`	`2111`	`}`
`2120`	`2112`
`2121`		`-.scraped-example .code-wrapper .line-numbers span {`
	`2113`	`+.scraped-example .code-wrapper .src-line-numbers span {`
`2122`	`2114`	`padding: 0 14px;`
`2123`	`2115`	`}`
`2124`	`2116`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,8 @@ pre, .rustdoc.source .example-wrap {`
`93`	`93`	`color: #ff7733;`
`94`	`94`	`}`
`95`	`95`
`96`		`-.line-numbers span { color: #5c6773; }`
`97`		`-.line-numbers .line-highlighted {`
	`96`	`+.src-line-numbers span { color: #5c6773; }`
	`97`	`+.src-line-numbers .line-highlighted {`
`98`	`98`	`color: #708090;`
`99`	`99`	`background-color: rgba(255, 236, 164, 0.06);`
`100`	`100`	`padding-right: 4px;`
`@@ -171,7 +171,7 @@ details.rustdoc-toggle > summary::before {`
`171`	`171`	`color: #788797;`
`172`	`172`	`}`
`173`	`173`
`174`		`-.line-numbers :target { background-color: transparent; }`
	`174`	`+.src-line-numbers :target { background-color: transparent; }`
`175`	`175`
`176`	`176`	`/* Code highlighting */`
`177`	`177`	`pre.rust .number, pre.rust .string { color: #b8cc52; }`
`@@ -190,7 +190,7 @@ pre.rust .attribute {`
`190`	`190`	`color: #e6e1cf;`
`191`	`191`	`}`
`192`	`192`
`193`		`-.example-wrap > pre.line-number {`
	`193`	`+pre.example-line-numbers {`
`194`	`194`	`color: #5c67736e;`
`195`	`195`	`border: none;`
`196`	`196`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ input:focus + .slider {`
`54`	`54`	`background: #444;`
`55`	`55`	`}`
`56`	`56`
`57`		`-.line-numbers span { color: #3B91E2; }`
`58`		`-.line-numbers .line-highlighted {`
	`57`	`+.src-line-numbers span { color: #3B91E2; }`
	`58`	`+.src-line-numbers .line-highlighted {`
`59`	`59`	`background-color: #0a042f !important;`
`60`	`60`	`}`
`61`	`61`
`@@ -141,7 +141,7 @@ details.rustdoc-toggle > summary::before {`
`141`	`141`	`background: none;`
`142`	`142`	`}`
`143`	`143`
`144`		`-.line-numbers :target { background-color: transparent; }`
	`144`	`+.src-line-numbers :target { background-color: transparent; }`
`145`	`145`
`146`	`146`	`/* Code highlighting */`
`147`	`147`	`pre.rust .kw { color: #ab8ac1; }`
`@@ -155,7 +155,7 @@ pre.rust .question-mark {`
`155`	`155`	`color: #ff9011;`
`156`	`156`	`}`
`157`	`157`
`158`		`-.example-wrap > pre.line-number {`
	`158`	`+pre.example-line-numbers {`
`159`	`159`	`border-color: #4a4949;`
`160`	`160`	`}`
`161`	`161`
Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ input:focus + .slider {`
`53`	`53`	`background-color: #fff;`
`54`	`54`	`}`
`55`	`55`
`56`		`-.line-numbers span { color: #c67e2d; }`
`57`		`-.line-numbers .line-highlighted {`
	`56`	`+.src-line-numbers span { color: #c67e2d; }`
	`57`	`+.src-line-numbers .line-highlighted {`
`58`	`58`	`background-color: #FDFFD3 !important;`
`59`	`59`	`}`
`60`	`60`
`@@ -125,7 +125,7 @@ body.source .example-wrap pre.rust a {`
`125`	`125`	`.stab { background: #FFF5D6; border-color: #FFC600; }`
`126`	`126`	`.stab.portability > code { background: none; }`
`127`	`127`
`128`		`-.line-numbers :target { background-color: transparent; }`
	`128`	`+.src-line-numbers :target { background-color: transparent; }`
`129`	`129`
`130`	`130`	`/* Code highlighting */`
`131`	`131`	`pre.rust .kw { color: #8959A8; }`
`@@ -141,7 +141,7 @@ pre.rust .question-mark {`
`141`	`141`	`color: #ff9011;`
`142`	`142`	`}`
`143`	`143`
`144`		`-.example-wrap > pre.line-number {`
	`144`	`+pre.example-line-numbers {`
`145`	`145`	`border-color: #c7c7c7;`
`146`	`146`	`}`
`147`	`147`