rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustdoc: where clause adjustment to fix tests

Browse Source 
- add spaces to output so stripping lines and breaking spaces renders
  the same
- add commas to where clauses in rustdoc tests to match the new output
This commit is contained in:
QuietMisdreavus
2017-04-06 14:19:45 -05:00
parent 36bc448c00
commit ae0e45c028
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/librustdoc/html/format.rs
View File

@@ -192,9 +192,9 @@ impl<'a> fmt::Display for WhereClause<'a> {
clause.push_str(" where");
} else {
if end_newline {
clause.push_str("<span class=\"where fmt-newline\">where");
clause.push_str(" <span class=\"where fmt-newline\">where");
} else {
clause.push_str("<span class=\"where\">where");
clause.push_str(" <span class=\"where\">where");
}
}
for (i, pred) in gens.where_predicates.iter().enumerate() {
@@ -241,8 +241,11 @@ impl<'a> fmt::Display for WhereClause<'a> {
clause.push_str("</span>");
let padding = repeat("&nbsp;").take(indent + 4).collect::<String>();
clause = clause.replace("<br>", &format!("<br>{}", padding));
clause.insert_str(0, &repeat("&nbsp;").take(indent).collect::<String>());
if !end_newline {
clause.insert_str(0, &repeat("&nbsp;").take(indent.saturating_sub(1))
.collect::<String>());
if end_newline {
clause.push(' ');
} else {
clause.insert_str(0, "<br>");
}
}