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

This commit is contained in:
Niko Matsakis 2013-05-06 09:00:50 -04:00
commit 6c0c3a44bd
4 changed files with 6 additions and 6 deletions

View file

@ -2444,7 +2444,7 @@ pub impl Parser {
}
}
}
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 @@ pub impl Parser {
rp: None,
types: ~[] };
return @spanned(lo,
self.span.hi,
self.last_span.hi,
view_path_simple(last, path, self.get_id()));
}