diff options
| author | bors <bors@rust-lang.org> | 2015-03-27 12:55:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-03-27 12:55:23 +0000 |
| commit | 242ed0b7c0f6a21096f2cc3e1ad1bdb176d02545 (patch) | |
| tree | 1fe893aa6129544fd0bde0fc58aa3d41cc33b5bf /src/libsyntax | |
| parent | 53a183f0274316596bf9405944d4f0468d8c93e4 (diff) | |
| parent | 1b98f6da7af8cea31066588776b7190c511455b1 (diff) | |
| download | rust-242ed0b7c0f6a21096f2cc3e1ad1bdb176d02545.tar.gz rust-242ed0b7c0f6a21096f2cc3e1ad1bdb176d02545.zip | |
Auto merge of #22930 - Gankro:entry_3, r=aturon
RFC pending, but this is the patch that does it. Totally untested. Likely needs some removed imports. std::collections docs should also be updated to provide better examples. Closes #23508
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/mtwt.rs | 10 | ||||
| -rw-r--r-- | src/libsyntax/lib.rs | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/libsyntax/ext/mtwt.rs b/src/libsyntax/ext/mtwt.rs index 72431d8e6aa..a2023d6832e 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) + .or_insert_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) + .or_insert_with(|| idx_push(&mut *table.table.borrow_mut(), Rename(id, to, ctxt))) } /// Apply a list of renamings to a context diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 9af7b9ab633..72498afa320 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -35,7 +35,6 @@ #![feature(quote, unsafe_destructor)] #![feature(rustc_private)] #![feature(staged_api)] -#![feature(std_misc)] #![feature(unicode)] #![feature(path_ext)] #![feature(str_char)] |