Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-08 01:28:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mozilla/incoming' into issue-5910-dyna-freeze

Browse Source
This commit is contained in:
Niko Matsakis
2013-05-06 09:00:50 -04:00
parent 2ea52a38e5 6e6a4be19d
commit 6c0c3a44bd
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsyntax/parse/attr.rs
+1 -1
View File
@@ -156,7 +156,7 @@ fn parse_meta_item(&self) -> @ast::meta_item {
@spanned(lo, hi, ast::meta_list(name, inner_items))
}
_ => {
let hi = self.span.hi;
let hi = self.last_span.hi;
@spanned(lo, hi, ast::meta_word(name))
}
}
src/libsyntax/parse/common.rs
+1 -1
View File
@@ -122,7 +122,7 @@ fn parse_ident(&self) -> ast::ident {
fn parse_path_list_ident(&self) -> ast::path_list_ident {
let lo = self.span.lo;
let ident = self.parse_ident();
let hi = self.span.hi;
let hi = self.last_span.hi;
spanned(lo, hi, ast::path_list_ident_ { name: ident,
id: self.get_id() })
}
src/libsyntax/parse/mod.rs
+2 -2
View File
@@ -591,7 +591,7 @@ fn parser_done(p: Parser){
types: ~[]},
None // no idea
),
span: sp(0,3)}, // really?
span: sp(0,1)},
id: 4 // fixme
})
}
@@ -628,7 +628,7 @@ fn parser_done(p: Parser){
types: ~[]},
None // no idea
),
span: sp(6,9)}, // bleah.
span: sp(6,7)},
id: 4 // fixme
}],
output: @ast::Ty{id:5, // fixme
src/libsyntax/parse/parser.rs
+2 -2
View File
@@ -2444,7 +2444,7 @@ fn parse_pat(&self, refutable: bool) -> @pat {
}
}
}
hi = self.span.hi;
hi = self.last_span.hi;
}
}
@ast::pat { id: self.get_id(), node: pat, span: mk_sp(lo, hi) }
@@ -4307,7 +4307,7 @@ fn parse_view_path(&self) -> @view_path {
rp: None,
types: ~[] };
return @spanned(lo,
self.span.hi,
self.last_span.hi,
view_path_simple(last, path, self.get_id()));
}