bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix errors from #22592

Browse source
This commit is contained in:
Manish Goregaokar 2015-02-21 16:26:57 +05:30
parent d316a34ec2
commit 47e749e5be
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/ext/expand.rs
View file

@ -1980,7 +1980,7 @@ foo_module!();
// the xx binding should bind all of the xx varrefs: // the xx binding should bind all of the xx varrefs:
for (idx,v) in varrefs.iter().filter(|p| { for (idx,v) in varrefs.iter().filter(|p| {
p.segments.len() == 1 p.segments.len() == 1
&& "xx" == &token::get_ident(p.segments[0].identifier) && "xx" == &*token::get_ident(p.segments[0].identifier)
}).enumerate() { }).enumerate() {
if mtwt::resolve(v.segments[0].identifier) != resolved_binding { if mtwt::resolve(v.segments[0].identifier) != resolved_binding {
println!("uh oh, xx binding didn't match xx varref:"); println!("uh oh, xx binding didn't match xx varref:");

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

@ -827,19 +827,19 @@ mod test {
ast::TtDelimited(_, ref macro_delimed)] ast::TtDelimited(_, ref macro_delimed)]
if name_macro_rules.as_str() == "macro_rules" if name_macro_rules.as_str() == "macro_rules"
&& name_zip.as_str() == "zip" => { && name_zip.as_str() == "zip" => {
match &macro_delimed.tts { match &macro_delimed.tts[..] {
[ast::TtDelimited(_, ref first_delimed), [ast::TtDelimited(_, ref first_delimed),
ast::TtToken(_, token::FatArrow), ast::TtToken(_, token::FatArrow),
ast::TtDelimited(_, ref second_delimed)] ast::TtDelimited(_, ref second_delimed)]
if macro_delimed.delim == token::Paren => { if macro_delimed.delim == token::Paren => {
match &first_delimed.tts { match &first_delimed.tts[..] {
[ast::TtToken(_, token::Dollar), [ast::TtToken(_, token::Dollar),
ast::TtToken(_, token::Ident(name, token::Plain))] ast::TtToken(_, token::Ident(name, token::Plain))]
if first_delimed.delim == token::Paren if first_delimed.delim == token::Paren
&& name.as_str() == "a" => {}, && name.as_str() == "a" => {},
_ => panic!("value 3: {:?}", **first_delimed), _ => panic!("value 3: {:?}", **first_delimed),
} }
match &second_delimed.tts { match &second_delimed.tts[..] {
[ast::TtToken(_, token::Dollar), [ast::TtToken(_, token::Dollar),
ast::TtToken(_, token::Ident(name, token::Plain))] ast::TtToken(_, token::Ident(name, token::Plain))]
if second_delimed.delim == token::Paren if second_delimed.delim == token::Paren
@ -1207,7 +1207,7 @@ mod test {
let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string(); let source = "/// doc comment\r\n/// line 2\r\nfn foo() {}".to_string();
let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap(); let item = parse_item_from_source_str(name.clone(), source, Vec::new(), &sess).unwrap();
let docs = item.attrs.iter().filter(|a| &a.name() == "doc") let docs = item.attrs.iter().filter(|a| &*a.name() == "doc")
.map(|a| a.value_str().unwrap().to_string()).collect::<Vec<_>>(); .map(|a| a.value_str().unwrap().to_string()).collect::<Vec<_>>();
let b: &[_] = &["/// doc comment".to_string(), "/// line 2".to_string()]; let b: &[_] = &["/// doc comment".to_string(), "/// line 2".to_string()];
assert_eq!(&docs[..], b); assert_eq!(&docs[..], b);