Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 7 pull requests #71556

Merged
merged 19 commits into from
Apr 25, 2020
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
6cdb825
Implement BitOr and BitOrAssign for the NonZero integer types
Mar 8, 2020
3f1a588
stabilize BTreeMap::remove_entry
DutchGhost Apr 2, 2020
cdb6bef
Deprecate `Box::into_raw_non_null`
SimonSapin Apr 15, 2020
b359fe1
Deprecate `Rc::into_raw_non_null` and `Arc::into_raw_non_null`
SimonSapin Apr 15, 2020
9a1c7db
Apply suggestions from code review
SimonSapin Apr 15, 2020
7709d20
Implement `Box::into_raw` based on `Box::leak`
SimonSapin Apr 15, 2020
4282776
Replace filter_map().next() calls with find_map()
cuviper Apr 25, 2020
19c29c4
Fix comment in docstring example for Error::kind
Askaholic Apr 25, 2020
b1fbd79
Add missing Send and Sync bounds for linked list Cursor and CursorMut.
crlf0710 Apr 25, 2020
df99de5
proc_macro: Stabilize `Span::resolved_at` and `Span::located_at`
petrochenkov Feb 10, 2020
966a295
Add a test for `Span::resolved_at` and `Span::located_at`
petrochenkov Apr 18, 2020
78a034d
Use the correct bound for `Cursor` `Send`
crlf0710 Apr 25, 2020
7b7c63c
Rollup merge of #69041 - petrochenkov:stabmodispan, r=Amanieu
Dylan-DPC Apr 25, 2020
b6e03c4
Rollup merge of #69813 - thomcc:nonzero-bitor, r=Amanieu
Dylan-DPC Apr 25, 2020
29fd528
Rollup merge of #70712 - :stabilize-remove-entry, r=Amanieu
Dylan-DPC Apr 25, 2020
939c932
Rollup merge of #71168 - SimonSapin:into_raw_non_null, r=Amanieu
Dylan-DPC Apr 25, 2020
9709785
Rollup merge of #71544 - cuviper:filter_map_next, r=Mark-Simulacrum
Dylan-DPC Apr 25, 2020
ecef6c7
Rollup merge of #71545 - Askaholic:patch-1, r=jonas-schievink
Dylan-DPC Apr 25, 2020
82642d7
Rollup merge of #71548 - crlf0710:cursor_bounds, r=Amanieu
Dylan-DPC Apr 25, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
stabilize BTreeMap::remove_entry
  • Loading branch information
DutchGhost committed Apr 2, 2020
commit 3f1a588a941d271a157ad78d0c748a1e95d8da63
3 changes: 1 addition & 2 deletions src/liballoc/collections/btree/map.rs
Original file line number Diff line number Diff line change
@@ -894,15 +894,14 @@ impl<K: Ord, V> BTreeMap<K, V> {
/// Basic usage:
///
/// ```
/// #![feature(btreemap_remove_entry)]
/// use std::collections::BTreeMap;
///
/// let mut map = BTreeMap::new();
/// map.insert(1, "a");
/// assert_eq!(map.remove_entry(&1), Some((1, "a")));
/// assert_eq!(map.remove_entry(&1), None);
/// ```
#[unstable(feature = "btreemap_remove_entry", issue = "66714")]
#[stable(feature = "btreemap_remove_entry", since = "1.44.0")]
pub fn remove_entry<Q: ?Sized>(&mut self, key: &Q) -> Option<(K, V)>
where
K: Borrow<Q>,