user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #14900 : alexcrichton/rust/snapshots, r=huonw

Browse source 
Closes #14898
Closes #14918
This commit is contained in:
bors 2014-06-16 08:16:49 +00:00
commit 7ec78053ec
94 changed files with 321 additions and 841 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/librustdoc/html/format.rs
View file

@ -91,7 +91,6 @@ impl fmt::Show for clean::Generics {
impl fmt::Show for clean::Lifetime {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
try!(f.write("'".as_bytes()));
try!(f.write(self.get_ref().as_bytes()));
Ok(())
}

2
src/librustdoc/html/highlight.rs
View file

@ -126,7 +126,7 @@ fn doit(sess: &parse::ParseSess, mut lexer: lexer::StringReader,
// span when we see the ']'.
t::POUND => {
is_attribute = true;
try!(write!(out, r"<span class='attribute'>\#"));
try!(write!(out, r"<span class='attribute'>#"));
continue
}
t::RBRACKET => {

2
src/librustdoc/html/layout.rs
View file

@ -86,7 +86,7 @@ r##"<!DOCTYPE html>
<dd>Move up in search results</dd>
<dt>&darr;</dt>
<dd>Move down in search results</dd>
<dt>&\#9166;</dt>
<dt>&#9166;</dt>
<dd>Go to active search result</dd>
</dl>
</div>

4
src/librustdoc/html/markdown.rs
View file

@ -259,8 +259,8 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result {
};
// Render the HTML
let text = format!(r#"<h{lvl} id="{id}" class='section-header'><a
href="\#{id}">{sec}{}</a></h{lvl}>"#,
let text = format!(r##"<h{lvl} id="{id}" class='section-header'><a
href="#{id}">{sec}{}</a></h{lvl}>"##,
s, lvl = level, id = id,
sec = if sec.len() == 0 {
sec.to_string()

2
src/librustdoc/html/toc.rs
View file

@ -179,7 +179,7 @@ impl fmt::Show for Toc {
// recursively format this table of contents (the
// `{children}` is the key).
try!(write!(fmt,
"\n<li><a href=\"\\#{id}\">{num} {name}</a>{children}</li>",
"\n<li><a href=\"#{id}\">{num} {name}</a>{children}</li>",
id = entry.id,
num = entry.sec_number, name = entry.name,
children = entry.children))

2
src/librustdoc/test.rs
View file

@ -136,7 +136,7 @@ fn runtest(test: &str, cratename: &str, libs: HashSet<Path>, should_fail: bool,
let old = io::stdio::set_stderr(box w1);
spawn(proc() {
let mut p = io::ChanReader::new(rx);
let mut err = old.unwrap_or(box io::stderr() as Box<Writer:Send>);
let mut err = old.unwrap_or(box io::stderr() as Box<Writer + Send>);
io::util::copy(&mut p, &mut err).unwrap();
});
let emitter = diagnostic::EmitterWriter::new(box w2);