diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-10-29 06:03:32 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-11-08 19:42:46 -0500 |
| commit | 1f4faaee401f8681e25afbcf3b6296b6cd2ca55a (patch) | |
| tree | f0dac4e7f58ebab635c4bba59a04fca2833db4a8 /src/librustc/front | |
| parent | 85c51d3b02e421e2ab99c330e0d8212293f64f04 (diff) | |
| download | rust-1f4faaee401f8681e25afbcf3b6296b6cd2ca55a.tar.gz rust-1f4faaee401f8681e25afbcf3b6296b6cd2ca55a.zip | |
Generalize AST and ty::Generics to accept multiple lifetimes.
Diffstat (limited to 'src/librustc/front')
| -rw-r--r-- | src/librustc/front/std_inject.rs | 4 | ||||
| -rw-r--r-- | src/librustc/front/test.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc/front/std_inject.rs b/src/librustc/front/std_inject.rs index b34829bf47f..c2d0251b23c 100644 --- a/src/librustc/front/std_inject.rs +++ b/src/librustc/front/std_inject.rs @@ -116,12 +116,12 @@ impl fold::ast_fold for StandardLibraryInjector { segments: ~[ ast::PathSegment { identifier: self.sess.ident_of("std"), - lifetime: None, + lifetimes: opt_vec::Empty, types: opt_vec::Empty, }, ast::PathSegment { identifier: self.sess.ident_of("prelude"), - lifetime: None, + lifetimes: opt_vec::Empty, types: opt_vec::Empty, }, ], diff --git a/src/librustc/front/test.rs b/src/librustc/front/test.rs index 9541a03aff2..b6ae4183377 100644 --- a/src/librustc/front/test.rs +++ b/src/librustc/front/test.rs @@ -343,7 +343,7 @@ fn path_node(ids: ~[ast::Ident]) -> ast::Path { global: false, segments: ids.move_iter().map(|identifier| ast::PathSegment { identifier: identifier, - lifetime: None, + lifetimes: opt_vec::Empty, types: opt_vec::Empty, }).collect() } @@ -355,7 +355,7 @@ fn path_node_global(ids: ~[ast::Ident]) -> ast::Path { global: true, segments: ids.move_iter().map(|identifier| ast::PathSegment { identifier: identifier, - lifetime: None, + lifetimes: opt_vec::Empty, types: opt_vec::Empty, }).collect() } |