diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-02-05 19:41:45 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-02-05 19:41:45 -0800 |
| commit | 801f3225b24a796402b83f660f80e62ac504befe (patch) | |
| tree | d569b736ba6493b17c29ccc25823956cf8e1732c /src/libsyntax/ext | |
| parent | a4250a96fdf61142a9c8dbb6d37ae8435c99e396 (diff) | |
| download | rust-801f3225b24a796402b83f660f80e62ac504befe.tar.gz rust-801f3225b24a796402b83f660f80e62ac504befe.zip | |
oldmap: use &K instead of K in find and get
This reverts commit a4250a96fdf61142a9c8dbb6d37ae8435c99e396. This is not the cause of the nonexhaustive-match failure.
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 8 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/transcribe.rs | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 227a86e0766..18256369c78 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -40,7 +40,7 @@ pub fn expand_expr(exts: HashMap<~str, SyntaxExtension>, cx: ext_ctxt, /* using idents and token::special_idents would make the the macro names be hygienic */ let extname = cx.parse_sess().interner.get(pth.idents[0]); - match exts.find(*extname) { + match exts.find(extname) { None => { cx.span_fatal(pth.span, fmt!("macro undefined: '%s'", *extname)) @@ -104,7 +104,7 @@ pub fn expand_mod_items(exts: HashMap<~str, SyntaxExtension>, cx: ext_ctxt, ast::meta_name_value(ref n, _) => (*n), ast::meta_list(ref n, _) => (*n) }; - match exts.find(mname) { + match exts.find(&mname) { None | Some(NormalTT(_)) | Some(ItemTT(*)) => items, Some(ItemDecorator(dec_fn)) => { cx.bt_push(ExpandedFrom({call_site: attr.span, @@ -161,7 +161,7 @@ pub fn expand_item_mac(exts: HashMap<~str, SyntaxExtension>, }; let extname = cx.parse_sess().interner.get(pth.idents[0]); - let expanded = match exts.find(*extname) { + let expanded = match exts.find(extname) { None => cx.span_fatal(pth.span, fmt!("macro undefined: '%s!'", *extname)), @@ -224,7 +224,7 @@ pub fn expand_stmt(exts: HashMap<~str, SyntaxExtension>, cx: ext_ctxt, assert(vec::len(pth.idents) == 1u); let extname = cx.parse_sess().interner.get(pth.idents[0]); - let (fully_expanded, sp) = match exts.find(*extname) { + let (fully_expanded, sp) = match exts.find(extname) { None => cx.span_fatal(pth.span, fmt!("macro undefined: '%s'", *extname)), diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index 31172cbfa85..3e7a84240e4 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -59,11 +59,11 @@ pub fn add_new_extension(cx: ext_ctxt, sp: span, name: ident, arg_reader as reader, argument_gram); // Extract the arguments: - let lhses:~[@named_match] = match argument_map.get(lhs_nm) { + let lhses:~[@named_match] = match argument_map.get(&lhs_nm) { @matched_seq(s, _) => s, _ => cx.span_bug(sp, ~"wrong-structured lhs") }; - let rhses:~[@named_match] = match argument_map.get(rhs_nm) { + let rhses:~[@named_match] = match argument_map.get(&rhs_nm) { @matched_seq(s, _) => s, _ => cx.span_bug(sp, ~"wrong-structured rhs") }; diff --git a/src/libsyntax/ext/tt/transcribe.rs b/src/libsyntax/ext/tt/transcribe.rs index 6bf90617a6e..6f57ca38f1f 100644 --- a/src/libsyntax/ext/tt/transcribe.rs +++ b/src/libsyntax/ext/tt/transcribe.rs @@ -111,7 +111,7 @@ pure fn lookup_cur_matched_by_matched(r: tt_reader, } fn lookup_cur_matched(r: tt_reader, name: ident) -> @named_match { - lookup_cur_matched_by_matched(r, r.interpolations.get(name)) + lookup_cur_matched_by_matched(r, r.interpolations.get(&name)) } enum lis { lis_unconstrained, lis_constraint(uint, ident), lis_contradiction(~str) |
