bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #21258: aturon/stab-3-index

Browse source 
Conflicts:
	src/libcore/ops.rs
	src/librustc_typeck/astconv.rs
	src/libstd/io/mem.rs
	src/libsyntax/parse/lexer/mod.rs
This commit is contained in:
Alex Crichton 2015-01-21 11:53:49 -08:00
commit 886c6f3534
59 changed files with 352 additions and 429 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -749,7 +749,7 @@ impl<'a> SourceCollector<'a> {
// Remove the utf-8 BOM if any
let contents = if contents.starts_with("\u{feff}") {
contents.slice_from(3)
&contents[3..]
} else {
contents
};
@ -1469,7 +1469,7 @@ fn full_path(cx: &Context, item: &clean::Item) -> String {
fn shorter<'a>(s: Option<&'a str>) -> &'a str {
match s {
Some(s) => match s.find_str("\n\n") {
Some(pos) => s.slice_to(pos),
Some(pos) => &s[..pos],
None => s,
},
None => ""