bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #20721: japaric/snap

Browse source 
Conflicts:
	src/libcollections/vec.rs
	src/libcore/fmt/mod.rs
	src/librustc/lint/builtin.rs
	src/librustc/session/config.rs
	src/librustc_trans/trans/base.rs
	src/librustc_trans/trans/context.rs
	src/librustc_trans/trans/type_.rs
	src/librustc_typeck/check/_match.rs
	src/librustdoc/html/format.rs
	src/libsyntax/std_inject.rs
	src/libsyntax/util/interner.rs
	src/test/compile-fail/mut-pattern-mismatched.rs
This commit is contained in:
Alex Crichton 2015-01-07 17:26:58 -08:00
commit 6e806bdefd
236 changed files with 2421 additions and 2495 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_back/svh.rs
View file

@ -64,7 +64,7 @@ impl Svh {
}
pub fn as_str<'a>(&'a self) -> &'a str {
self.hash.index(&FullRange)
&self.hash[]
}
pub fn calculate(metadata: &Vec<String>, krate: &ast::Crate) -> Svh {
@ -362,7 +362,7 @@ mod svh_visitor {
fn macro_name(mac: &Mac) -> token::InternedString {
match &mac.node {
&MacInvocTT(ref path, ref _tts, ref _stx_ctxt) => {
let s = path.segments.index(&FullRange);
let s = &path.segments[];
assert_eq!(s.len(), 1);
content(s[0].identifier)
}