diff options
| author | Alexis <a.beingessner@gmail.com> | 2015-03-01 09:42:11 -0500 |
|---|---|---|
| committer | Alexis <a.beingessner@gmail.com> | 2015-03-26 21:36:06 -0400 |
| commit | 93cdf1f2783e3a863929a5ef2032e7de752e4e40 (patch) | |
| tree | 33639adfd0d7c50b42528a196cdeaa6c4ee18845 /src/libsyntax | |
| parent | 1c35953cf8baa2e721401ba6354f0bd9a9f2abaf (diff) | |
| download | rust-93cdf1f2783e3a863929a5ef2032e7de752e4e40.tar.gz rust-93cdf1f2783e3a863929a5ef2032e7de752e4e40.zip | |
update everything to use Entry defaults
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/mtwt.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index 72431d8e6aa..2b811ce914f 100644 --- a/src/libsyntax/ext/mtwt.rs +++ b/src/libsyntax/ext/mtwt.rs @@ -66,9 +66,8 @@ pub fn apply_mark(m: Mrk, ctxt: SyntaxContext) -> SyntaxContext { /// Extend a syntax context with a given mark and sctable (explicit memoization) fn apply_mark_internal(m: Mrk, ctxt: SyntaxContext, table: &SCTable) -> SyntaxContext { let key = (ctxt, m); - * table.mark_memo.borrow_mut().entry(key).get().unwrap_or_else( - |vacant_entry| - vacant_entry.insert(idx_push(&mut *table.table.borrow_mut(), Mark(m, ctxt)))) + * table.mark_memo.borrow_mut().entry(key) + .default_with(|| idx_push(&mut *table.table.borrow_mut(), Mark(m, ctxt))) } /// Extend a syntax context with a given rename @@ -84,9 +83,8 @@ fn apply_rename_internal(id: Ident, table: &SCTable) -> SyntaxContext { let key = (ctxt, id, to); - * table.rename_memo.borrow_mut().entry(key).get().unwrap_or_else( - |vacant_entry| - vacant_entry.insert(idx_push(&mut *table.table.borrow_mut(), Rename(id, to, ctxt)))) + * table.rename_memo.borrow_mut().entry(key) + .default_with(|| idx_push(&mut *table.table.borrow_mut(), Rename(id, to, ctxt))) } /// Apply a list of renamings to a context |