user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #18630 : nikomatsakis/purge-the-bars

Browse source
This commit is contained in:
Alex Crichton 2014-11-06 13:31:18 -08:00
commit 76d2abe0e7
45 changed files with 954 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libsyntax/ext/build.rs
View file

@ -313,14 +313,15 @@ impl<'a> AstBuilder for ExtCtxt<'a> {
.map(|ident| {
ast::PathSegment {
identifier: ident,
lifetimes: Vec::new(),
types: OwnedSlice::empty(),
parameters: ast::PathParameters::none(),
}
}).collect();
segments.push(ast::PathSegment {
identifier: last_identifier,
lifetimes: lifetimes,
types: OwnedSlice::from_vec(types),
parameters: ast::AngleBracketedParameters(ast::AngleBracketedParameterData {
lifetimes: lifetimes,
types: OwnedSlice::from_vec(types),
})
});
ast::Path {
span: sp,

4
src/libsyntax/ext/concat_idents.rs
View file

@ -12,7 +12,6 @@ use ast;
use codemap::Span;
use ext::base::*;
use ext::base;
use owned_slice::OwnedSlice;
use parse::token;
use parse::token::{str_to_ident};
use ptr::P;
@ -52,8 +51,7 @@ pub fn expand_syntax_ext<'cx>(cx: &mut ExtCtxt, sp: Span, tts: &[ast::TokenTree]
segments: vec!(
ast::PathSegment {
identifier: res,
lifetimes: Vec::new(),
types: OwnedSlice::empty(),
parameters: ast::PathParameters::none(),
}
)
}