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

rollup merge of #20269: dirk/indent-where

Browse Source 
* Add <span class=‘where’> around clause
* CSS rule to format the span

(for issue #20176)
This commit is contained in:
Alex Crichton
2014-12-29 16:36:35 -08:00
parent 1d373ae6d1 57a3ef3f9b
commit 1e9c7c51cb
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ impl<'a> fmt::Show for WhereClause<'a> {
if gens.where_predicates.len() == 0 { if gens.where_predicates.len() == 0 {
return Ok(()); return Ok(());
} }
try!(f.write(" where ".as_bytes())); try!(f.write(" <span class='where'>where ".as_bytes()));
for (i, pred) in gens.where_predicates.iter().enumerate() { for (i, pred) in gens.where_predicates.iter().enumerate() {
if i > 0 { if i > 0 {
try!(f.write(", ".as_bytes())); try!(f.write(", ".as_bytes()));
@@ -146,6 +146,7 @@ impl<'a> fmt::Show for WhereClause<'a> {
} }
} }
} }
try!(f.write("</span>".as_bytes()));
Ok(()) Ok(())
} }
} }

5
src/librustdoc/html/static/main.css
View File

@@ -306,6 +306,11 @@ nav.sub {
font-size: 1em; font-size: 1em;
position: relative; position: relative;
} }
/* Shift "where ..." part of method definition down a line */
.content .method .where { display: block; }
/* Bit of whitespace to indent it */
.content .method .where::before { content: ' '; }
.content .methods .docblock { margin-left: 40px; } .content .methods .docblock { margin-left: 40px; }
.content .impl-items .docblock { margin-left: 40px; } .content .impl-items .docblock { margin-left: 40px; }