OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #68659 - Dylan-DPC:rollup-zo7zi9f, r=Dylan-DPC

Browse Source 
Rollup of 6 pull requests

Successful merges:

 - #66648 (Implement clone_from for BTreeMap and BTreeSet)
 - #68468 (BTreeMap: tag and explain unsafe internal functions or assert preconditions)
 - #68626 (Use termize instead of term_size)
 - #68640 (Document remaining undocumented `From` implementations for IPs)
 - #68651 (Document `From` implementation for NonZero nums)
 - #68655 (Fix revision annotations in borrowck-feature-nll-overrides-migrate)

Failed merges:

r? @ghost
This commit is contained in:
bors 2020-01-30 02:25:56 +00:00
commit 3024c4e739
12 changed files with 332 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock
View File

@ -3540,8 +3540,8 @@ dependencies = [
"rustc_data_structures", "rustc_data_structures",
"rustc_span", "rustc_span",
"serialize", "serialize",
"term_size",
"termcolor", "termcolor",
"termize",
"unicode-width", "unicode-width",
"winapi 0.3.8", "winapi 0.3.8",
] ]
@ -4580,6 +4580,16 @@ dependencies = [
"redox_termios", "redox_termios",
] ]
[[package]]
name = "termize"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1706be6b564323ce7092f5f7e6b118a14c8ef7ed0e69c8c5329c914a9f101295"
dependencies = [
"libc",
"winapi 0.3.8",
]
[[package]] [[package]]
name = "test" name = "test"
version = "0.0.0" version = "0.0.0"

91
src/liballoc/collections/btree/map.rs
View File

@ -207,6 +207,60 @@ impl<K: Clone, V: Clone> Clone for BTreeMap<K, V> {
clone_subtree(self.root.as_ref()) clone_subtree(self.root.as_ref())
} }
} }
fn clone_from(&mut self, other: &Self) {
BTreeClone::clone_from(self, other);
}
}
trait BTreeClone {
fn clone_from(&mut self, other: &Self);
}
impl<K: Clone, V: Clone> BTreeClone for BTreeMap<K, V> {
default fn clone_from(&mut self, other: &Self) {
*self = other.clone();
}
}
impl<K: Clone + Ord, V: Clone> BTreeClone for BTreeMap<K, V> {
fn clone_from(&mut self, other: &Self) {
// This truncates `self` to `other.len()` by calling `split_off` on
// the first key after `other.len()` elements if it exists
let split_off_key = if self.len() > other.len() {
let diff = self.len() - other.len();
if diff <= other.len() {
self.iter().nth_back(diff - 1).map(|pair| (*pair.0).clone())
} else {
self.iter().nth(other.len()).map(|pair| (*pair.0).clone())
}
} else {
None
};
if let Some(key) = split_off_key {
self.split_off(&key);
}
let mut siter = self.range_mut(..);
let mut oiter = other.iter();
// After truncation, `self` is at most as long as `other` so this loop
// replaces every key-value pair in `self`. Since `oiter` is in sorted
// order and the structure of the `BTreeMap` stays the same,
// the BTree invariants are maintained at the end of the loop
while !siter.is_empty() {
if let Some((ok, ov)) = oiter.next() {
// SAFETY: This is safe because the `siter.front != siter.back` check
// ensures that `siter` is nonempty
let (sk, sv) = unsafe { siter.next_unchecked() };
sk.clone_from(ok);
sv.clone_from(ov);
} else {
break;
}
}
// If `other` is longer than `self`, the remaining elements are inserted
self.extend(oiter.map(|(k, v)| ((*k).clone(), (*v).clone())));
}
} }
impl<K, Q: ?Sized> super::Recover<Q> for BTreeMap<K, ()> impl<K, Q: ?Sized> super::Recover<Q> for BTreeMap<K, ()>
@ -1357,7 +1411,10 @@ impl<'a, K: 'a, V: 'a> Iterator for IterMut<'a, K, V> {
None None
} else { } else {
self.length -= 1; self.length -= 1;
unsafe { Some(self.range.next_unchecked()) } unsafe {
let (k, v) = self.range.next_unchecked();
Some((k, v)) // coerce k from `&mut K` to `&K`
}
} }
} }
@ -1736,7 +1793,14 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
type Item = (&'a K, &'a mut V); type Item = (&'a K, &'a mut V);
fn next(&mut self) -> Option<(&'a K, &'a mut V)> { fn next(&mut self) -> Option<(&'a K, &'a mut V)> {
if self.front == self.back { None } else { unsafe { Some(self.next_unchecked()) } } if self.is_empty() {
None
} else {
unsafe {
let (k, v) = self.next_unchecked();
Some((k, v)) // coerce k from `&mut K` to `&K`
}
}
} }
fn last(mut self) -> Option<(&'a K, &'a mut V)> { fn last(mut self) -> Option<(&'a K, &'a mut V)> {
@ -1745,7 +1809,11 @@ impl<'a, K, V> Iterator for RangeMut<'a, K, V> {
} }
impl<'a, K, V> RangeMut<'a, K, V> { impl<'a, K, V> RangeMut<'a, K, V> {
unsafe fn next_unchecked(&mut self) -> (&'a K, &'a mut V) { fn is_empty(&self) -> bool {
self.front == self.back
}
unsafe fn next_unchecked(&mut self) -> (&'a mut K, &'a mut V) {
let handle = ptr::read(&self.front); let handle = ptr::read(&self.front);
let mut cur_handle = match handle.right_kv() { let mut cur_handle = match handle.right_kv() {
@ -1753,8 +1821,7 @@ impl<'a, K, V> RangeMut<'a, K, V> {
self.front = ptr::read(&kv).right_edge(); self.front = ptr::read(&kv).right_edge();
// Doing the descend invalidates the references returned by `into_kv_mut`, // Doing the descend invalidates the references returned by `into_kv_mut`,
// so we have to do this last. // so we have to do this last.
let (k, v) = kv.into_kv_mut(); return kv.into_kv_mut();
return (k, v); // coerce k from `&mut K` to `&K`
} }
Err(last_edge) => { Err(last_edge) => {
let next_level = last_edge.into_node().ascend().ok(); let next_level = last_edge.into_node().ascend().ok();
@ -1768,8 +1835,7 @@ impl<'a, K, V> RangeMut<'a, K, V> {
self.front = first_leaf_edge(ptr::read(&kv).right_edge().descend()); self.front = first_leaf_edge(ptr::read(&kv).right_edge().descend());
// Doing the descend invalidates the references returned by `into_kv_mut`, // Doing the descend invalidates the references returned by `into_kv_mut`,
// so we have to do this last. // so we have to do this last.
let (k, v) = kv.into_kv_mut(); return kv.into_kv_mut();
return (k, v); // coerce k from `&mut K` to `&K`
} }
Err(last_edge) => { Err(last_edge) => {
let next_level = last_edge.into_node().ascend().ok(); let next_level = last_edge.into_node().ascend().ok();
@ -1783,7 +1849,7 @@ impl<'a, K, V> RangeMut<'a, K, V> {
#[stable(feature = "btree_range", since = "1.17.0")] #[stable(feature = "btree_range", since = "1.17.0")]
impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> { impl<'a, K, V> DoubleEndedIterator for RangeMut<'a, K, V> {
fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> { fn next_back(&mut self) -> Option<(&'a K, &'a mut V)> {
if self.front == self.back { None } else { unsafe { Some(self.next_back_unchecked()) } } if self.is_empty() { None } else { unsafe { Some(self.next_back_unchecked()) } }
} }
} }
@ -2030,8 +2096,13 @@ where
} }
} }
let front = Handle::new_edge(min_node, min_edge); // Safety guarantee: `min_edge` is always in range for `min_node`, because
let back = Handle::new_edge(max_node, max_edge); // `min_edge` is unconditionally calculated for each iteration's value of `min_node`,
// either (if not found) as the edge index returned by `search_linear`,
// or (if found) as the KV index returned by `search_linear`, possibly + 1.
// Likewise for `max_node` versus `max_edge`.
let front = unsafe { Handle::new_edge(min_node, min_edge) };
let back = unsafe { Handle::new_edge(max_node, max_edge) };
match (front.force(), back.force()) { match (front.force(), back.force()) {
(Leaf(f), Leaf(b)) => { (Leaf(f), Leaf(b)) => {
return (f, b); return (f, b);

188
src/liballoc/collections/btree/node.rs
View File

@ -263,10 +263,10 @@ impl<K, V> Root<K, V> {
/// Removes the root node, using its first child as the new root. This cannot be called when /// Removes the root node, using its first child as the new root. This cannot be called when
/// the tree consists only of a leaf node. As it is intended only to be called when the root /// the tree consists only of a leaf node. As it is intended only to be called when the root
/// has only one edge, no cleanup is done on any of the other children are elements of the root. /// has only one edge, no cleanup is done on any of the other children of the root.
/// This decreases the height by 1 and is the opposite of `push_level`. /// This decreases the height by 1 and is the opposite of `push_level`.
pub fn pop_level(&mut self) { pub fn pop_level(&mut self) {
debug_assert!(self.height > 0); assert!(self.height > 0);
let top = self.node.ptr; let top = self.node.ptr;
@ -344,6 +344,9 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> { impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
/// Finds the length of the node. This is the number of keys or values. In an /// Finds the length of the node. This is the number of keys or values. In an
/// internal node, the number of edges is `len() + 1`. /// internal node, the number of edges is `len() + 1`.
/// For any node, the number of possible edge handles is also `len() + 1`.
/// Note that, despite being safe, calling this function can have the side effect
/// of invalidating mutable references that unsafe code has created.
pub fn len(&self) -> usize { pub fn len(&self) -> usize {
self.as_header().len as usize self.as_header().len as usize
} }
@ -369,7 +372,8 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
/// If the node is a leaf, this function simply opens up its data. /// If the node is a leaf, this function simply opens up its data.
/// If the node is an internal node, so not a leaf, it does have all the data a leaf has /// If the node is an internal node, so not a leaf, it does have all the data a leaf has
/// (header, keys and values), and this function exposes that. /// (header, keys and values), and this function exposes that.
/// See `NodeRef` on why the node may not be a shared root. /// Unsafe because the node must not be the shared root. For more information,
/// see the `NodeRef` comments.
unsafe fn as_leaf(&self) -> &LeafNode<K, V> { unsafe fn as_leaf(&self) -> &LeafNode<K, V> {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
self.node.as_ref() self.node.as_ref()
@ -385,14 +389,14 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
} }
/// Borrows a view into the keys stored in the node. /// Borrows a view into the keys stored in the node.
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
pub unsafe fn keys(&self) -> &[K] { pub unsafe fn keys(&self) -> &[K] {
self.reborrow().into_key_slice() self.reborrow().into_key_slice()
} }
/// Borrows a view into the values stored in the node. /// Borrows a view into the values stored in the node.
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn vals(&self) -> &[V] { unsafe fn vals(&self) -> &[V] {
self.reborrow().into_val_slice() self.reborrow().into_val_slice()
} }
@ -424,25 +428,26 @@ impl<BorrowType, K, V, Type> NodeRef<BorrowType, K, V, Type> {
} }
pub fn first_edge(self) -> Handle<Self, marker::Edge> { pub fn first_edge(self) -> Handle<Self, marker::Edge> {
Handle::new_edge(self, 0) unsafe { Handle::new_edge(self, 0) }
} }
pub fn last_edge(self) -> Handle<Self, marker::Edge> { pub fn last_edge(self) -> Handle<Self, marker::Edge> {
let len = self.len(); let len = self.len();
Handle::new_edge(self, len) unsafe { Handle::new_edge(self, len) }
} }
/// Note that `self` must be nonempty. /// Note that `self` must be nonempty.
pub fn first_kv(self) -> Handle<Self, marker::KV> { pub fn first_kv(self) -> Handle<Self, marker::KV> {
debug_assert!(self.len() > 0); let len = self.len();
Handle::new_kv(self, 0) assert!(len > 0);
unsafe { Handle::new_kv(self, 0) }
} }
/// Note that `self` must be nonempty. /// Note that `self` must be nonempty.
pub fn last_kv(self) -> Handle<Self, marker::KV> { pub fn last_kv(self) -> Handle<Self, marker::KV> {
let len = self.len(); let len = self.len();
debug_assert!(len > 0); assert!(len > 0);
Handle::new_kv(self, len - 1) unsafe { Handle::new_kv(self, len - 1) }
} }
} }
@ -453,7 +458,7 @@ impl<K, V> NodeRef<marker::Owned, K, V, marker::Leaf> {
pub unsafe fn deallocate_and_ascend( pub unsafe fn deallocate_and_ascend(
self, self,
) -> Option<Handle<NodeRef<marker::Owned, K, V, marker::Internal>, marker::Edge>> { ) -> Option<Handle<NodeRef<marker::Owned, K, V, marker::Internal>, marker::Edge>> {
debug_assert!(!self.is_shared_root()); assert!(!self.is_shared_root());
let node = self.node; let node = self.node;
let ret = self.ascend().ok(); let ret = self.ascend().ok();
Global.dealloc(node.cast(), Layout::new::<LeafNode<K, V>>()); Global.dealloc(node.cast(), Layout::new::<LeafNode<K, V>>());
@ -508,36 +513,36 @@ impl<'a, K, V, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
self.node.as_ptr() self.node.as_ptr()
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn keys_mut(&mut self) -> &mut [K] { unsafe fn keys_mut(&mut self) -> &mut [K] {
unsafe { self.reborrow_mut().into_key_slice_mut() } self.reborrow_mut().into_key_slice_mut()
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn vals_mut(&mut self) -> &mut [V] { unsafe fn vals_mut(&mut self) -> &mut [V] {
unsafe { self.reborrow_mut().into_val_slice_mut() } self.reborrow_mut().into_val_slice_mut()
} }
} }
impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Immut<'a>, K, V, Type> { impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Immut<'a>, K, V, Type> {
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
unsafe fn into_key_slice(self) -> &'a [K] { unsafe fn into_key_slice(self) -> &'a [K] {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
// We cannot be the shared root, so `as_leaf` is okay. // We cannot be the shared root, so `as_leaf` is okay.
slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().keys), self.len()) slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().keys), self.len())
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_val_slice(self) -> &'a [V] { unsafe fn into_val_slice(self) -> &'a [V] {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
// We cannot be the shared root, so `as_leaf` is okay. // We cannot be the shared root, so `as_leaf` is okay.
unsafe { slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().vals), self.len()) } slice::from_raw_parts(MaybeUninit::first_ptr(&self.as_leaf().vals), self.len())
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_slices(self) -> (&'a [K], &'a [V]) { unsafe fn into_slices(self) -> (&'a [K], &'a [V]) {
let k = unsafe { ptr::read(&self) }; let k = ptr::read(&self);
(unsafe { k.into_key_slice() }, self.into_val_slice()) (k.into_key_slice(), self.into_val_slice())
} }
} }
@ -548,54 +553,45 @@ impl<'a, K: 'a, V: 'a, Type> NodeRef<marker::Mut<'a>, K, V, Type> {
unsafe { &mut *(self.root as *mut Root<K, V>) } unsafe { &mut *(self.root as *mut Root<K, V>) }
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_key_slice_mut(mut self) -> &'a mut [K] { unsafe fn into_key_slice_mut(mut self) -> &'a mut [K] {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
// We cannot be the shared root, so `as_leaf_mut` is okay. // We cannot be the shared root, so `as_leaf_mut` is okay.
unsafe {
slice::from_raw_parts_mut( slice::from_raw_parts_mut(
MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).keys), MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).keys),
self.len(), self.len(),
) )
} }
}
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_val_slice_mut(mut self) -> &'a mut [V] { unsafe fn into_val_slice_mut(mut self) -> &'a mut [V] {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
unsafe {
slice::from_raw_parts_mut( slice::from_raw_parts_mut(
MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).vals), MaybeUninit::first_ptr_mut(&mut (*self.as_leaf_mut()).vals),
self.len(), self.len(),
) )
} }
}
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_slices_mut(mut self) -> (&'a mut [K], &'a mut [V]) { unsafe fn into_slices_mut(mut self) -> (&'a mut [K], &'a mut [V]) {
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
// We cannot use the getters here, because calling the second one // We cannot use the getters here, because calling the second one
// invalidates the reference returned by the first. // invalidates the reference returned by the first.
// More precisely, it is the call to `len` that is the culprit, // More precisely, it is the call to `len` that is the culprit,
// because that creates a shared reference to the header, which *can* // because that creates a shared reference to the header, which *can*
// overlap with the keys (and even the values, for ZST keys). // overlap with the keys (and even the values, for ZST keys).
unsafe {
let len = self.len(); let len = self.len();
let leaf = self.as_leaf_mut(); let leaf = self.as_leaf_mut();
let keys = let keys = slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).keys), len);
slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).keys), len); let vals = slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).vals), len);
let vals =
slice::from_raw_parts_mut(MaybeUninit::first_ptr_mut(&mut (*leaf).vals), len);
(keys, vals) (keys, vals)
} }
}
} }
impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Leaf> { impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Leaf> {
/// Adds a key/value pair the end of the node. /// Adds a key/value pair the end of the node.
pub fn push(&mut self, key: K, val: V) { pub fn push(&mut self, key: K, val: V) {
// Necessary for correctness, but this is an internal module assert!(self.len() < CAPACITY);
debug_assert!(self.len() < CAPACITY);
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
let idx = self.len(); let idx = self.len();
@ -610,8 +606,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Leaf> {
/// Adds a key/value pair to the beginning of the node. /// Adds a key/value pair to the beginning of the node.
pub fn push_front(&mut self, key: K, val: V) { pub fn push_front(&mut self, key: K, val: V) {
// Necessary for correctness, but this is an internal module assert!(self.len() < CAPACITY);
debug_assert!(self.len() < CAPACITY);
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
unsafe { unsafe {
@ -627,9 +622,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
/// Adds a key/value pair and an edge to go to the right of that pair to /// Adds a key/value pair and an edge to go to the right of that pair to
/// the end of the node. /// the end of the node.
pub fn push(&mut self, key: K, val: V, edge: Root<K, V>) { pub fn push(&mut self, key: K, val: V, edge: Root<K, V>) {
// Necessary for correctness, but this is an internal module assert!(edge.height == self.height - 1);
debug_assert!(edge.height == self.height - 1); assert!(self.len() < CAPACITY);
debug_assert!(self.len() < CAPACITY);
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
let idx = self.len(); let idx = self.len();
@ -645,23 +639,25 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> {
} }
} }
fn correct_childrens_parent_links(&mut self, first: usize, after_last: usize) { // Unsafe because 'first' and 'after_last' must be in range
unsafe fn correct_childrens_parent_links(&mut self, first: usize, after_last: usize) {
debug_assert!(first <= self.len());
debug_assert!(after_last <= self.len() + 1);
for i in first..after_last { for i in first..after_last {
Handle::new_edge(unsafe { self.reborrow_mut() }, i).correct_parent_link(); Handle::new_edge(self.reborrow_mut(), i).correct_parent_link();
} }
} }
fn correct_all_childrens_parent_links(&mut self) { fn correct_all_childrens_parent_links(&mut self) {
let len = self.len(); let len = self.len();
self.correct_childrens_parent_links(0, len + 1); unsafe { self.correct_childrens_parent_links(0, len + 1) };
} }
/// Adds a key/value pair and an edge to go to the left of that pair to /// Adds a key/value pair and an edge to go to the left of that pair to
/// the beginning of the node. /// the beginning of the node.
pub fn push_front(&mut self, key: K, val: V, edge: Root<K, V>) { pub fn push_front(&mut self, key: K, val: V, edge: Root<K, V>) {
// Necessary for correctness, but this is an internal module assert!(edge.height == self.height - 1);
debug_assert!(edge.height == self.height - 1); assert!(self.len() < CAPACITY);
debug_assert!(self.len() < CAPACITY);
debug_assert!(!self.is_shared_root()); debug_assert!(!self.is_shared_root());
unsafe { unsafe {
@ -687,8 +683,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
/// Removes a key/value pair from the end of this node. If this is an internal node, /// Removes a key/value pair from the end of this node. If this is an internal node,
/// also removes the edge that was to the right of that pair. /// also removes the edge that was to the right of that pair.
pub fn pop(&mut self) -> (K, V, Option<Root<K, V>>) { pub fn pop(&mut self) -> (K, V, Option<Root<K, V>>) {
// Necessary for correctness, but this is an internal module assert!(self.len() > 0);
debug_assert!(self.len() > 0);
let idx = self.len() - 1; let idx = self.len() - 1;
@ -714,8 +709,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
/// Removes a key/value pair from the beginning of this node. If this is an internal node, /// Removes a key/value pair from the beginning of this node. If this is an internal node,
/// also removes the edge that was to the left of that pair. /// also removes the edge that was to the left of that pair.
pub fn pop_front(&mut self) -> (K, V, Option<Root<K, V>>) { pub fn pop_front(&mut self) -> (K, V, Option<Root<K, V>>) {
// Necessary for correctness, but this is an internal module assert!(self.len() > 0);
debug_assert!(self.len() > 0);
let old_len = self.len(); let old_len = self.len();
@ -750,8 +744,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
} }
} }
/// The caller must ensure that the node is not the shared root. /// Unsafe because the caller must ensure that the node is not the shared root.
fn into_kv_pointers_mut(mut self) -> (*mut K, *mut V) { unsafe fn into_kv_pointers_mut(mut self) -> (*mut K, *mut V) {
(self.keys_mut().as_mut_ptr(), self.vals_mut().as_mut_ptr()) (self.keys_mut().as_mut_ptr(), self.vals_mut().as_mut_ptr())
} }
} }
@ -813,20 +807,20 @@ impl<Node, Type> Handle<Node, Type> {
} }
impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV> { impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV> {
/// Creates a new handle to a key/value pair in `node`. `idx` must be less than `node.len()`. /// Creates a new handle to a key/value pair in `node`.
pub fn new_kv(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self { /// Unsafe because the caller must ensure that `idx < node.len()`.
// Necessary for correctness, but in a private module pub unsafe fn new_kv(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
debug_assert!(idx < node.len()); debug_assert!(idx < node.len());
Handle { node, idx, _marker: PhantomData } Handle { node, idx, _marker: PhantomData }
} }
pub fn left_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> { pub fn left_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
Handle::new_edge(self.node, self.idx) unsafe { Handle::new_edge(self.node, self.idx) }
} }
pub fn right_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> { pub fn right_edge(self) -> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
Handle::new_edge(self.node, self.idx + 1) unsafe { Handle::new_edge(self.node, self.idx + 1) }
} }
} }
@ -868,21 +862,28 @@ impl<'a, K, V, NodeType, HandleType> Handle<NodeRef<marker::Mut<'a>, K, V, NodeT
} }
impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> { impl<BorrowType, K, V, NodeType> Handle<NodeRef<BorrowType, K, V, NodeType>, marker::Edge> {
/// Creates a new handle to an edge in `node`. `idx` must be less than or equal to /// Creates a new handle to an edge in `node`.
/// `node.len()`. /// Unsafe because the caller must ensure that `idx <= node.len()`.
pub fn new_edge(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self { pub unsafe fn new_edge(node: NodeRef<BorrowType, K, V, NodeType>, idx: usize) -> Self {
// Necessary for correctness, but in a private module
debug_assert!(idx <= node.len()); debug_assert!(idx <= node.len());
Handle { node, idx, _marker: PhantomData } Handle { node, idx, _marker: PhantomData }
} }
pub fn left_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> { pub fn left_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> {
if self.idx > 0 { Ok(Handle::new_kv(self.node, self.idx - 1)) } else { Err(self) } if self.idx > 0 {
Ok(unsafe { Handle::new_kv(self.node, self.idx - 1) })
} else {
Err(self)
}
} }
pub fn right_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> { pub fn right_kv(self) -> Result<Handle<NodeRef<BorrowType, K, V, NodeType>, marker::KV>, Self> {
if self.idx < self.node.len() { Ok(Handle::new_kv(self.node, self.idx)) } else { Err(self) } if self.idx < self.node.len() {
Ok(unsafe { Handle::new_kv(self.node, self.idx) })
} else {
Err(self)
}
} }
} }
@ -914,9 +915,10 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge
pub fn insert(mut self, key: K, val: V) -> (InsertResult<'a, K, V, marker::Leaf>, *mut V) { pub fn insert(mut self, key: K, val: V) -> (InsertResult<'a, K, V, marker::Leaf>, *mut V) {
if self.node.len() < CAPACITY { if self.node.len() < CAPACITY {
let ptr = self.insert_fit(key, val); let ptr = self.insert_fit(key, val);
(InsertResult::Fit(Handle::new_kv(self.node, self.idx)), ptr) let kv = unsafe { Handle::new_kv(self.node, self.idx) };
(InsertResult::Fit(kv), ptr)
} else { } else {
let middle = Handle::new_kv(self.node, B); let middle = unsafe { Handle::new_kv(self.node, B) };
let (mut left, k, v, mut right) = middle.split(); let (mut left, k, v, mut right) = middle.split();
let ptr = if self.idx <= B { let ptr = if self.idx <= B {
unsafe { Handle::new_edge(left.reborrow_mut(), self.idx).insert_fit(key, val) } unsafe { Handle::new_edge(left.reborrow_mut(), self.idx).insert_fit(key, val) }
@ -991,14 +993,14 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
val: V, val: V,
edge: Root<K, V>, edge: Root<K, V>,
) -> InsertResult<'a, K, V, marker::Internal> { ) -> InsertResult<'a, K, V, marker::Internal> {
// Necessary for correctness, but this is an internal module assert!(edge.height == self.node.height - 1);
debug_assert!(edge.height == self.node.height - 1);
if self.node.len() < CAPACITY { if self.node.len() < CAPACITY {
self.insert_fit(key, val, edge); self.insert_fit(key, val, edge);
InsertResult::Fit(Handle::new_kv(self.node, self.idx)) let kv = unsafe { Handle::new_kv(self.node, self.idx) };
InsertResult::Fit(kv)
} else { } else {
let middle = Handle::new_kv(self.node, B); let middle = unsafe { Handle::new_kv(self.node, B) };
let (mut left, k, v, mut right) = middle.split(); let (mut left, k, v, mut right) = middle.split();
if self.idx <= B { if self.idx <= B {
unsafe { unsafe {
@ -1037,15 +1039,19 @@ impl<BorrowType, K, V> Handle<NodeRef<BorrowType, K, V, marker::Internal>, marke
impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Immut<'a>, K, V, NodeType>, marker::KV> { impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Immut<'a>, K, V, NodeType>, marker::KV> {
pub fn into_kv(self) -> (&'a K, &'a V) { pub fn into_kv(self) -> (&'a K, &'a V) {
unsafe {
let (keys, vals) = self.node.into_slices(); let (keys, vals) = self.node.into_slices();
unsafe { (keys.get_unchecked(self.idx), vals.get_unchecked(self.idx)) } (keys.get_unchecked(self.idx), vals.get_unchecked(self.idx))
}
} }
} }
impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Mut<'a>, K, V, NodeType>, marker::KV> { impl<'a, K: 'a, V: 'a, NodeType> Handle<NodeRef<marker::Mut<'a>, K, V, NodeType>, marker::KV> {
pub fn into_kv_mut(self) -> (&'a mut K, &'a mut V) { pub fn into_kv_mut(self) -> (&'a mut K, &'a mut V) {
unsafe {
let (keys, vals) = self.node.into_slices_mut(); let (keys, vals) = self.node.into_slices_mut();
unsafe { (keys.get_unchecked_mut(self.idx), vals.get_unchecked_mut(self.idx)) } (keys.get_unchecked_mut(self.idx), vals.get_unchecked_mut(self.idx))
}
} }
} }
@ -1067,7 +1073,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::KV>
/// - All the key/value pairs to the right of this handle are put into a newly /// - All the key/value pairs to the right of this handle are put into a newly
/// allocated node. /// allocated node.
pub fn split(mut self) -> (NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, K, V, Root<K, V>) { pub fn split(mut self) -> (NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, K, V, Root<K, V>) {
debug_assert!(!self.node.is_shared_root()); assert!(!self.node.is_shared_root());
unsafe { unsafe {
let mut new_node = Box::new(LeafNode::new()); let mut new_node = Box::new(LeafNode::new());
@ -1099,7 +1105,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::KV>
pub fn remove( pub fn remove(
mut self, mut self,
) -> (Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>, K, V) { ) -> (Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::Edge>, K, V) {
debug_assert!(!self.node.is_shared_root()); assert!(!self.node.is_shared_root());
unsafe { unsafe {
let k = slice_remove(self.node.keys_mut(), self.idx); let k = slice_remove(self.node.keys_mut(), self.idx);
let v = slice_remove(self.node.vals_mut(), self.idx); let v = slice_remove(self.node.vals_mut(), self.idx);
@ -1182,7 +1188,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
let right_len = right_node.len(); let right_len = right_node.len();
// necessary for correctness, but in a private module // necessary for correctness, but in a private module
debug_assert!(left_len + right_len + 1 <= CAPACITY); assert!(left_len + right_len + 1 <= CAPACITY);
unsafe { unsafe {
ptr::write( ptr::write(
@ -1281,8 +1287,8 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
let right_len = right_node.len(); let right_len = right_node.len();
// Make sure that we may steal safely. // Make sure that we may steal safely.
debug_assert!(right_len + count <= CAPACITY); assert!(right_len + count <= CAPACITY);
debug_assert!(left_len >= count); assert!(left_len >= count);
let new_left_len = left_len - count; let new_left_len = left_len - count;
@ -1338,8 +1344,8 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
let right_len = right_node.len(); let right_len = right_node.len();
// Make sure that we may steal safely. // Make sure that we may steal safely.
debug_assert!(left_len + count <= CAPACITY); assert!(left_len + count <= CAPACITY);
debug_assert!(right_len >= count); assert!(right_len >= count);
let new_right_len = right_len - count; let new_right_len = right_len - count;
@ -1447,9 +1453,10 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal>, ma
let right_new_len = left_node.len() - left_new_len; let right_new_len = left_node.len() - left_new_len;
let mut right_node = right.reborrow_mut(); let mut right_node = right.reborrow_mut();
debug_assert!(right_node.len() == 0); assert!(right_node.len() == 0);
debug_assert!(left_node.height == right_node.height); assert!(left_node.height == right_node.height);
if right_new_len > 0 {
let left_kv = left_node.reborrow_mut().into_kv_pointers_mut(); let left_kv = left_node.reborrow_mut().into_kv_pointers_mut();
let right_kv = right_node.reborrow_mut().into_kv_pointers_mut(); let right_kv = right_node.reborrow_mut().into_kv_pointers_mut();
@ -1469,6 +1476,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal>, ma
} }
} }
} }
}
} }
pub enum ForceResult<Leaf, Internal> { pub enum ForceResult<Leaf, Internal> {

4
src/liballoc/collections/btree/search.rs
View File

@ -41,8 +41,8 @@ where
K: Borrow<Q>, K: Borrow<Q>,
{ {
match search_linear(&node, key) { match search_linear(&node, key) {
(idx, true) => Found(Handle::new_kv(node, idx)), (idx, true) => Found(unsafe { Handle::new_kv(node, idx) }),
(idx, false) => SearchResult::GoDown(Handle::new_edge(node, idx)), (idx, false) => SearchResult::GoDown(unsafe { Handle::new_edge(node, idx) }),
} }
} }

13
src/liballoc/collections/btree/set.rs
View File

@ -56,12 +56,23 @@ use crate::collections::btree_map::{self, BTreeMap, Keys};
/// println!("{}", book); /// println!("{}", book);
/// } /// }
/// ``` /// ```
#[derive(Clone, Hash, PartialEq, Eq, Ord, PartialOrd)] #[derive(Hash, PartialEq, Eq, Ord, PartialOrd)]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
pub struct BTreeSet<T> { pub struct BTreeSet<T> {
map: BTreeMap<T, ()>, map: BTreeMap<T, ()>,
} }
#[stable(feature = "rust1", since = "1.0.0")]
impl<T: Clone> Clone for BTreeSet<T> {
fn clone(&self) -> Self {
BTreeSet { map: self.map.clone() }
}
fn clone_from(&mut self, other: &Self) {
self.map.clone_from(&other.map);
}
}
/// An iterator over the items of a `BTreeSet`. /// An iterator over the items of a `BTreeSet`.
/// ///
/// This `struct` is created by the [`iter`] method on [`BTreeSet`]. /// This `struct` is created by the [`iter`] method on [`BTreeSet`].

20
src/liballoc/tests/btree/map.rs
View File

@ -785,6 +785,26 @@ fn test_clone() {
} }
} }
#[test]
fn test_clone_from() {
let mut map1 = BTreeMap::new();
let size = 30;
for i in 0..size {
let mut map2 = BTreeMap::new();
for j in 0..i {
let mut map1_copy = map2.clone();
map1_copy.clone_from(&map1);
assert_eq!(map1_copy, map1);
let mut map2_copy = map1.clone();
map2_copy.clone_from(&map2);
assert_eq!(map2_copy, map2);
map2.insert(100 * j + 1, 2 * j + 1);
}
map1.insert(i, 10 * i);
}
}
#[test] #[test]
#[allow(dead_code)] #[allow(dead_code)]
fn test_variance() { fn test_variance() {

4
src/libcore/num/mod.rs
View File

@ -91,10 +91,14 @@ assert_eq!(size_of::<Option<core::num::", stringify!($Ty), ">>(), size_of::<", s
#[stable(feature = "from_nonzero", since = "1.31.0")] #[stable(feature = "from_nonzero", since = "1.31.0")]
impl From<$Ty> for $Int { impl From<$Ty> for $Int {
doc_comment! {
concat!(
"Converts a `", stringify!($Ty), "` into an `", stringify!($Int), "`"),
fn from(nonzero: $Ty) -> Self { fn from(nonzero: $Ty) -> Self {
nonzero.0 nonzero.0
} }
} }
}
impl_nonzero_fmt! { impl_nonzero_fmt! {
#[$stability] (Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty #[$stability] (Debug, Display, Binary, Octal, LowerHex, UpperHex) for $Ty

2
src/librustc_errors/Cargo.toml
View File

@ -18,7 +18,7 @@ unicode-width = "0.1.4"
atty = "0.2" atty = "0.2"
termcolor = "1.0" termcolor = "1.0"
annotate-snippets = "0.6.1" annotate-snippets = "0.6.1"
term_size = "0.3.1" termize = "0.1.1"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winapi = { version = "0.3", features = ["handleapi", "synchapi", "winbase"] } winapi = { version = "0.3", features = ["handleapi", "synchapi", "winbase"] }

2
src/librustc_errors/emitter.rs
View File

@ -1367,7 +1367,7 @@ impl EmitterWriter {
} else if self.ui_testing { } else if self.ui_testing {
140 140
} else { } else {
term_size::dimensions() termize::dimensions()
.map(|(w, _)| w.saturating_sub(code_offset)) .map(|(w, _)| w.saturating_sub(code_offset))
.unwrap_or(std::usize::MAX) .unwrap_or(std::usize::MAX)
}; };

72
src/libstd/net/ip.rs
View File

@ -813,6 +813,20 @@ impl fmt::Display for IpAddr {
#[stable(feature = "ip_from_ip", since = "1.16.0")] #[stable(feature = "ip_from_ip", since = "1.16.0")]
impl From<Ipv4Addr> for IpAddr { impl From<Ipv4Addr> for IpAddr {
/// Copies this address to a new `IpAddr::V4`.
///
/// # Examples
///
/// ```
/// use std::net::{IpAddr, Ipv4Addr};
///
/// let addr = Ipv4Addr::new(127, 0, 0, 1);
///
/// assert_eq!(
/// IpAddr::V4(addr),
/// IpAddr::from(addr)
/// )
/// ```
fn from(ipv4: Ipv4Addr) -> IpAddr { fn from(ipv4: Ipv4Addr) -> IpAddr {
IpAddr::V4(ipv4) IpAddr::V4(ipv4)
} }
@ -820,6 +834,20 @@ impl From<Ipv4Addr> for IpAddr {
#[stable(feature = "ip_from_ip", since = "1.16.0")] #[stable(feature = "ip_from_ip", since = "1.16.0")]
impl From<Ipv6Addr> for IpAddr { impl From<Ipv6Addr> for IpAddr {
/// Copies this address to a new `IpAddr::V6`.
///
/// # Examples
///
/// ```
/// use std::net::{IpAddr, Ipv6Addr};
///
/// let addr = Ipv6Addr::new(0, 0, 0, 0, 0, 0xffff, 0xc00a, 0x2ff);
///
/// assert_eq!(
/// IpAddr::V6(addr),
/// IpAddr::from(addr)
/// );
/// ```
fn from(ipv6: Ipv6Addr) -> IpAddr { fn from(ipv6: Ipv6Addr) -> IpAddr {
IpAddr::V6(ipv6) IpAddr::V6(ipv6)
} }
@ -975,6 +1003,8 @@ impl From<u32> for Ipv4Addr {
#[stable(feature = "from_slice_v4", since = "1.9.0")] #[stable(feature = "from_slice_v4", since = "1.9.0")]
impl From<[u8; 4]> for Ipv4Addr { impl From<[u8; 4]> for Ipv4Addr {
/// Creates an `Ipv4Addr` from a four element byte array.
///
/// # Examples /// # Examples
/// ///
/// ``` /// ```
@ -1734,6 +1764,27 @@ impl From<u128> for Ipv6Addr {
#[stable(feature = "ipv6_from_octets", since = "1.9.0")] #[stable(feature = "ipv6_from_octets", since = "1.9.0")]
impl From<[u8; 16]> for Ipv6Addr { impl From<[u8; 16]> for Ipv6Addr {
/// Creates an `Ipv6Addr` from a sixteen element byte array.
///
/// # Examples
///
/// ```
/// use std::net::Ipv6Addr;
///
/// let addr = Ipv6Addr::from([
/// 25u8, 24u8, 23u8, 22u8, 21u8, 20u8, 19u8, 18u8,
/// 17u8, 16u8, 15u8, 14u8, 13u8, 12u8, 11u8, 10u8,
/// ]);
/// assert_eq!(
/// Ipv6Addr::new(
/// 0x1918, 0x1716,
/// 0x1514, 0x1312,
/// 0x1110, 0x0f0e,
/// 0x0d0c, 0x0b0a
/// ),
/// addr
/// );
/// ```
fn from(octets: [u8; 16]) -> Ipv6Addr { fn from(octets: [u8; 16]) -> Ipv6Addr {
let inner = c::in6_addr { s6_addr: octets }; let inner = c::in6_addr { s6_addr: octets };
Ipv6Addr::from_inner(inner) Ipv6Addr::from_inner(inner)
@ -1742,6 +1793,27 @@ impl From<[u8; 16]> for Ipv6Addr {
#[stable(feature = "ipv6_from_segments", since = "1.16.0")] #[stable(feature = "ipv6_from_segments", since = "1.16.0")]
impl From<[u16; 8]> for Ipv6Addr { impl From<[u16; 8]> for Ipv6Addr {
/// Creates an `Ipv6Addr` from an eight element 16-bit array.
///
/// # Examples
///
/// ```
/// use std::net::Ipv6Addr;
///
/// let addr = Ipv6Addr::from([
/// 525u16, 524u16, 523u16, 522u16,
/// 521u16, 520u16, 519u16, 518u16,
/// ]);
/// assert_eq!(
/// Ipv6Addr::new(
/// 0x20d, 0x20c,
/// 0x20b, 0x20a,
/// 0x209, 0x208,
/// 0x207, 0x206
/// ),
/// addr
/// );
/// ```
fn from(segments: [u16; 8]) -> Ipv6Addr { fn from(segments: [u16; 8]) -> Ipv6Addr {
let [a, b, c, d, e, f, g, h] = segments; let [a, b, c, d, e, f, g, h] = segments;
Ipv6Addr::new(a, b, c, d, e, f, g, h) Ipv6Addr::new(a, b, c, d, e, f, g, h)

4
src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs
View File

@ -9,8 +9,8 @@
// borrowck=migrate`. // borrowck=migrate`.
// revisions: zflag edition // revisions: zflag edition
// [zflag]compile-flags: -Z borrowck=migrate //[zflag]compile-flags: -Z borrowck=migrate
// [edition]edition:2018 //[edition]edition:2018
#![feature(nll)] #![feature(nll)]

2
src/tools/tidy/src/deps.rs
View File

@ -167,7 +167,7 @@ const WHITELIST: &[Crate<'_>] = &[
Crate("termcolor"), Crate("termcolor"),
Crate("terminon"), Crate("terminon"),
Crate("termion"), Crate("termion"),
Crate("term_size"), Crate("termize"),
Crate("thread_local"), Crate("thread_local"),
Crate("ucd-util"), Crate("ucd-util"),
Crate("unicode-normalization"), Crate("unicode-normalization"),