Rollup merge of rust-lang#83645 - pickfire:patch-3, r=GuillaumeGomez

Dylan-DPC · web-flow · commit 9f9577c1aa9a · 2021-03-30T11:34:27.000+02:00
Wrap non-pre code blocks Fix rust-lang#83550 regression ``` $ cargo new --lib whitespace && cd whitespace && echo '//! `" foo "`' > src/lib.rs && cargo doc --open ``` Before ![](https://user-images.githubusercontent.com/89623/112713498-c0dfc200-8ed5-11eb-8c57-efdf26372e74.png) After ![](https://user-images.githubusercontent.com/89623/112713538-f08eca00-8ed5-11eb-8a98-675179f60ae2.png) r? ``@GuillaumeGomez`` cc ``@mgeisler``
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -424,7 +424,9 @@ nav.sub {
 	text-overflow: ellipsis;
 	margin: 0;
 }
-.docblock-short code {
+/* Wrap non-pre code blocks (`text`) but not (```text```). */
+.docblock > :not(pre) > code,
+.docblock-short > :not(pre) > code {
 	white-space: pre-wrap;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,9 @@ nav.sub {`
`424`	`424`	`text-overflow: ellipsis;`
`425`	`425`	`margin: 0;`
`426`	`426`	`}`
`427`		`-.docblock-short code {`
	`427`	+/* Wrap non-pre code blocks (`text`) but not (```text```). */
	`428`	`+.docblock > :not(pre) > code,`
	`429`	`+.docblock-short > :not(pre) > code {`
`428`	`430`	`white-space: pre-wrap;`
`429`	`431`	`}`
`430`	`432`