about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-04 19:01:33 +0000
committerbors <bors@rust-lang.org>2014-07-04 19:01:33 +0000
commit935da0739e71c5581e5e6abb564e18f894e0ec04 (patch)
treefebd32b41fc7a597d749fbd231f54b7137bed9a1 /src/libserialize
parent25e8b6ed9c9cf60448eb95a0e8a42330ed44f479 (diff)
parent29ec2506abb1d382e432cae2519aa7b7695c276a (diff)
auto merge of #15405 : pcwalton/rust/delifetime, r=nick29581
This was parsed by the parser but completely ignored; not even stored in
the AST!

This breaks code that looks like:

    static X: &'static [u8] = &'static [1, 2, 3];

Change this code to the shorter:

    static X: &'static [u8] = &[1, 2, 3];

Closes #15312.

[breaking-change]

r? @nick29581
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 832bc9c4e10..3e3c5d60376 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -1118,7 +1118,7 @@ impl<T: Iterator<char>> Parser<T> {
     /// Provides access to the current position in the logical structure of the
     /// JSON stream.
     pub fn stack<'l>(&'l self) -> &'l Stack {
-        return &'l self.stack;
+        return &self.stack;
     }
 
     fn eof(&self) -> bool { self.ch.is_none() }