diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-03-22 15:52:50 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-03-22 22:24:35 -0700 |
| commit | 6d81307a9b9f29e262164f9e358f50c186c76d76 (patch) | |
| tree | 620e4467c21651281114dfad71d36636eb4ff51b /src/libsyntax | |
| parent | 68cb53672b74e8b4352453e181667848cd63a183 (diff) | |
| download | rust-6d81307a9b9f29e262164f9e358f50c186c76d76.tar.gz rust-6d81307a9b9f29e262164f9e358f50c186c76d76.zip | |
librustc: Add explicit lifetime binders and new lifetime notation in core/std/syntax/rustc
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_parser.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index a69b3e20eb1..fb9d96a7831 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -494,7 +494,7 @@ pub fn core_macros() -> ~str { fn key(_x: @::core::condition::Handler<$in,$out>) { } pub static cond : - ::core::condition::Condition/&static<$in,$out> = + ::core::condition::Condition<'static,$in,$out> = ::core::condition::Condition { name: stringify!($c), key: key diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index b0628437bb0..688d7a57d91 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -109,7 +109,7 @@ pub fn is_some(&&mpu: matcher_pos_up) -> bool { } pub struct MatcherPos { - elts: ~[ast::matcher], // maybe should be /&? Need to understand regions. + elts: ~[ast::matcher], // maybe should be <'>? Need to understand regions. sep: Option<Token>, idx: uint, up: matcher_pos_up, // mutable for swapping only |