about summary refs log tree commit diff
path: root/src/libsyntax/parse/parser.rs
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2013-05-06 09:00:50 -0400
committerNiko Matsakis <niko@alum.mit.edu>2013-05-06 09:00:50 -0400
commit6c0c3a44bd779ea35f75cb7dcadcd7e6edb4a433 (patch)
treeb999d88bc2577a38ef9d3adde2d072b4c728178b /src/libsyntax/parse/parser.rs
parent2ea52a38e59b85b4b6998661b38425ce29839aed (diff)
parent6e6a4be19d8e6a2cedc66be6cc602db8a1e71acd (diff)
downloadrust-6c0c3a44bd779ea35f75cb7dcadcd7e6edb4a433.tar.gz
rust-6c0c3a44bd779ea35f75cb7dcadcd7e6edb4a433.zip
Merge remote-tracking branch 'mozilla/incoming' into issue-5910-dyna-freeze
Diffstat (limited to 'src/libsyntax/parse/parser.rs')
-rw-r--r--src/libsyntax/parse/parser.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 4839b179723..6b8411a9ead 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -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()));
     }