From 1f4faaee401f8681e25afbcf3b6296b6cd2ca55a Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 29 Oct 2013 06:03:32 -0400 Subject: Generalize AST and ty::Generics to accept multiple lifetimes. --- src/librustc/front/std_inject.rs | 4 ++-- src/librustc/front/test.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/librustc/front') 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() } -- cgit 1.4.1-3-g733a5