bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #33943 - jseyfried:libsyntax_cleanup, r=nrc

Browse source 
Miscellaneous low priority cleanup in `libsyntax`.
This commit is contained in:
Jeffrey Seyfried 2016-06-26 02:14:27 +00:00
commit 33ea1e330c
27 changed files with 269 additions and 365 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libsyntax/parse/mod.rs
View file

@ -662,7 +662,6 @@ pub fn integer_lit(s: &str,
#[cfg(test)]
mod tests {
use super::*;
use std::rc::Rc;
use syntax_pos::{Span, BytePos, Pos, NO_EXPANSION};
use codemap::Spanned;
use ast::{self, PatKind};
@ -763,7 +762,7 @@ mod tests {
)
if first_delimed.delim == token::Paren
&& ident.name.as_str() == "a" => {},
_ => panic!("value 3: {:?}", **first_delimed),
_ => panic!("value 3: {:?}", *first_delimed),
}
let tts = &second_delimed.tts[..];
match (tts.len(), tts.get(0), tts.get(1)) {
@ -774,10 +773,10 @@ mod tests {
)
if second_delimed.delim == token::Paren
&& ident.name.as_str() == "a" => {},
_ => panic!("value 4: {:?}", **second_delimed),
_ => panic!("value 4: {:?}", *second_delimed),
}
},
_ => panic!("value 2: {:?}", **macro_delimed),
_ => panic!("value 2: {:?}", *macro_delimed),
}
},
_ => panic!("value: {:?}",tts),
@ -793,7 +792,7 @@ mod tests {
TokenTree::Token(sp(3, 4), token::Ident(str_to_ident("a"))),
TokenTree::Delimited(
sp(5, 14),
Rc::new(tokenstream::Delimited {
tokenstream::Delimited {
delim: token::DelimToken::Paren,
open_span: sp(5, 6),
tts: vec![
@ -802,10 +801,10 @@ mod tests {
TokenTree::Token(sp(10, 13), token::Ident(str_to_ident("i32"))),
],
close_span: sp(13, 14),
})),
}),
TokenTree::Delimited(
sp(15, 21),
Rc::new(tokenstream::Delimited {
tokenstream::Delimited {
delim: token::DelimToken::Brace,
open_span: sp(15, 16),
tts: vec![
@ -813,7 +812,7 @@ mod tests {
TokenTree::Token(sp(18, 19), token::Semi),
],
close_span: sp(20, 21),
}))
})
];
assert_eq!(tts, expected);
@ -996,8 +995,8 @@ mod tests {
struct PatIdentVisitor {
spans: Vec<Span>
}
impl<'v> ::visit::Visitor<'v> for PatIdentVisitor {
fn visit_pat(&mut self, p: &'v ast::Pat) {
impl ::visit::Visitor for PatIdentVisitor {
fn visit_pat(&mut self, p: &ast::Pat) {
match p.node {
PatKind::Ident(_ , ref spannedident, _) => {
self.spans.push(spannedident.span.clone());