From 6a90e80b6240d8213f2b99fa470ef6ee04552d1b Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Fri, 20 Sep 2013 02:08:47 -0400 Subject: option: rewrite the API to use composition --- src/libsyntax/parse/parser.rs | 4 ++-- src/libsyntax/parse/token.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 484e40a1daa..9f1a436a4d5 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -405,7 +405,7 @@ impl Parser { fn tokens_to_str(p:&Parser, tokens: &[token::Token]) -> ~str { let mut i = tokens.iter(); // This might be a sign we need a connect method on Iterator. - let b = i.next().map_default(~"", |t| p.token_to_str(*t)); + let b = i.next().map_default(~"", |t| p.token_to_str(t)); i.fold(b, |b,a| b + "`, `" + p.token_to_str(a)) } if edible.contains(self.token) { @@ -470,7 +470,7 @@ impl Parser { pub fn commit_stmt(&self, s: @Stmt, edible: &[token::Token], inedible: &[token::Token]) { debug2!("commit_stmt {:?}", s); let _s = s; // unused, but future checks might want to inspect `s`. - if self.last_token.map_default(false, |t|is_ident_or_path(*t)) { + if self.last_token.as_ref().map_default(false, |t| is_ident_or_path(*t)) { let expected = vec::append(edible.to_owned(), inedible); self.check_for_erroneous_unit_struct_expecting(expected); } diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index 6d3f1d51576..eae3e665b58 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -510,7 +510,7 @@ static RESERVED_KEYWORD_FINAL: uint = 71; // fresh one. pub fn get_ident_interner() -> @ident_interner { local_data_key!(key: @@::parse::token::ident_interner) - match local_data::get(key, |k| k.map_move(|k| *k)) { + match local_data::get(key, |k| k.map(|k| *k)) { Some(interner) => *interner, None => { let interner = mk_fresh_ident_interner(); -- cgit 1.4.1-3-g733a5