mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #39222 - GuillaumeGomez:rustdoc_where, r=frewsxcv,steveklabnik,alexcrichton,nrc

Browse Source 
Force backline on all where in docs

Pictures are better than words in this case:

Before:

<img width="1440" alt="screen shot 2017-01-21 at 15 34 27" src="https://cloud.githubusercontent.com/assets/3050060/22175139/6e7c75d8-dfef-11e6-9904-023d63e609d2.png">

After:

<img width="1440" alt="screen shot 2017-01-21 at 15 34 32" src="https://cloud.githubusercontent.com/assets/3050060/22175140/75cc3846-dfef-11e6-9799-fffb213653e4.png">

r? @steveklabnik

cc @rust-lang/docs
This commit is contained in:
bors 2017-01-24 15:26:20 +00:00
commit fe597dc9a9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -165,7 +165,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if f.alternate() {
clause.push_str(" where ");
} else {
clause.push_str(" <span class='where'>where ");
clause.push_str(" <span class='where fmt-newline'>where ");
}
for (i, pred) in gens.where_predicates.iter().enumerate() {
if i > 0 {
@ -208,10 +208,9 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
clause.push_str("</span>");
let plain = format!("{:#}", self);
if plain.len() + pad > 80 {
//break it onto its own line regardless, but make sure method impls and trait
//blocks keep their fixed padding (2 and 9, respectively)
// break it onto its own line regardless, but make sure method impls and trait
// blocks keep their fixed padding (2 and 9, respectively)
let padding = if pad > 10 {
clause = clause.replace("class='where'", "class='where fmt-newline'");
repeat("&nbsp;").take(8).collect::<String>()
} else {
repeat("&nbsp;").take(pad + 6).collect::<String>()