Rollup merge of rust-lang#56476 - GuillaumeGomez:invalid-line-number-match, r=QuietMisdreavus

GuillaumeGomez · web-flow · commit 12cb472a42f7 · 2018-12-05T11:18:10.000+01:00
Fix invalid line number match If a code line is longer than the width, it then gets to the next line making the line number not matching it anymore. r? @QuietMisdreavus
diff --git a/src/librustdoc/html/static/rustdoc.css b/src/librustdoc/html/static/rustdoc.css
@@ -135,7 +135,6 @@ summary {
 
 code, pre {
 	font-family: "Source Code Pro", monospace;
-	white-space: pre-wrap;
 }
 .docblock code, .docblock-short code {
 	border-radius: 3px;
@@ -303,6 +302,7 @@ nav.sub {
 
 :not(.source) .example-wrap > pre.rust {
 	width: 100%;
+	overflow-x: auto;
 }
 
 body:not(.source) .example-wrap > pre {

Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,6 @@ summary {`
`135`	`135`
`136`	`136`	`code, pre {`
`137`	`137`	`font-family: "Source Code Pro", monospace;`
`138`		`- white-space: pre-wrap;`
`139`	`138`	`}`
`140`	`139`	`.docblock code, .docblock-short code {`
`141`	`140`	`border-radius: 3px;`
`@@ -303,6 +302,7 @@ nav.sub {`
`303`	`302`
`304`	`303`	`:not(.source) .example-wrap > pre.rust {`
`305`	`304`	`width: 100%;`
	`305`	`+ overflow-x: auto;`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`body:not(.source) .example-wrap > pre {`