Skip to content

Commit 67738c5

Browse files
committed
---
yaml --- r: 223718 b: refs/heads/beta c: f28f79b h: refs/heads/master v: v3
1 parent 4123701 commit 67738c5

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 374af4aea7878127ca52cbc271fb1237b4afe223
26+
refs/heads/beta: f28f79b79615fc77e65ec42c4e2a3960659150c9
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libsyntax/parse/parser.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1566,12 +1566,13 @@ impl<'a> Parser<'a> {
15661566
// Assumes that the leading `<` has been parsed already.
15671567
pub fn parse_qualified_path(&mut self, mode: PathParsingMode)
15681568
-> PResult<(QSelf, ast::Path)> {
1569+
let span = self.last_span;
15691570
let self_type = try!(self.parse_ty_sum());
15701571
let mut path = if try!(self.eat_keyword(keywords::As)) {
15711572
try!(self.parse_path(LifetimeAndTypesWithoutColons))
15721573
} else {
15731574
ast::Path {
1574-
span: self.span,
1575+
span: span,
15751576
global: false,
15761577
segments: vec![]
15771578
}
@@ -1598,9 +1599,6 @@ impl<'a> Parser<'a> {
15981599
};
15991600
path.segments.extend(segments);
16001601

1601-
if path.segments.len() == 1 {
1602-
path.span.lo = self.last_span.lo;
1603-
}
16041602
path.span.hi = self.last_span.hi;
16051603

16061604
Ok((qself, path))

branches/beta/src/test/run-make/save-analysis/foo.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,3 +364,18 @@ impl<'a> Pattern<'a> for CharEqPattern {
364364
}
365365

366366
struct CharSearcher<'a>(<CharEqPattern as Pattern<'a>>::Searcher);
367+
368+
pub trait Error {
369+
}
370+
371+
impl Error + 'static {
372+
pub fn is<T: Error + 'static>(&self) -> bool {
373+
panic!()
374+
}
375+
}
376+
377+
impl Error + 'static + Send {
378+
pub fn is<T: Error + 'static>(&self) -> bool {
379+
<Error + 'static>::is::<T>(self)
380+
}
381+
}

0 commit comments

Comments
 (0)