diff options
| author | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-10-03 12:44:47 +0300 |
|---|---|---|
| committer | Vadim Petrochenkov <vadim.petrochenkov@gmail.com> | 2015-10-03 12:44:47 +0300 |
| commit | f37d6fc6f3732ce00cfb332d028b46a7807341ae (patch) | |
| tree | 598fb0037e97489e5b2d5b3ceb89a326bb3da4e7 /src/libsyntax/ext | |
| parent | f492ec4bf4f2d8a69fd02ac186d1589bdfadd3bd (diff) | |
| download | rust-f37d6fc6f3732ce00cfb332d028b46a7807341ae.tar.gz rust-f37d6fc6f3732ce00cfb332d028b46a7807341ae.zip | |
libsyntax: Do not derive Hash for Ident
Diffstat (limited to 'src/libsyntax/ext')
| -rw-r--r-- | src/libsyntax/ext/mtwt.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index 21b4c77b9f8..bb58152e4ef 100644 --- a/src/libsyntax/ext/mtwt.rs +++ b/src/libsyntax/ext/mtwt.rs @@ -35,7 +35,7 @@ use std::collections::HashMap; pub struct SCTable { table: RefCell<Vec<SyntaxContext_>>, mark_memo: RefCell<HashMap<(SyntaxContext,Mrk),SyntaxContext>>, - rename_memo: RefCell<HashMap<(SyntaxContext,Name,SyntaxContext,Name),SyntaxContext>>, + rename_memo: RefCell<HashMap<(SyntaxContext,(Name,SyntaxContext),Name),SyntaxContext>>, } #[derive(PartialEq, RustcEncodable, RustcDecodable, Hash, Debug, Copy, Clone)] @@ -82,7 +82,7 @@ fn apply_rename_internal(id: Ident, to: Name, ctxt: SyntaxContext, table: &SCTable) -> SyntaxContext { - let key = (ctxt, id.name, id.ctxt, to); + let key = (ctxt, (id.name, id.ctxt), to); *table.rename_memo.borrow_mut().entry(key).or_insert_with(|| { SyntaxContext(idx_push(&mut *table.table.borrow_mut(), Rename(id, to, ctxt))) |