Adjust test outputs

Author: TimDiekmann

src/liballoc/collections/btree/map.rs

@@ -124,9 +124,8 @@ use UnderflowResult::*;
 /// ```
 #[stable(feature = "rust1", since = "1.0.0")]
 pub struct BTreeMap<K, V, A: AllocRef = Global> {
-    root: Option<node::Root<K, V>>,
+    root: Option<node::Root<K, V, A>>,
     length: usize,
-    alloc: PhantomData<A>,
 }
 
 #[stable(feature = "btree_drop", since = "1.7.0")]
@@ -150,11 +149,7 @@ impl<K: Clone, V: Clone> Clone for BTreeMap<K, V> {
         {
             match node.force() {
                 Leaf(leaf) => {
-                    let mut out_tree = BTreeMap {
-                        root: Some(node::Root::new_leaf()),
-                        length: 0,
-                        alloc: PhantomData,
-                    };
+                    let mut out_tree = BTreeMap { root: Some(node::Root::new_leaf()), length: 0 };
 
                     {
                         let root = out_tree.root.as_mut().unwrap();
@@ -216,7 +211,7 @@ impl<K: Clone, V: Clone> Clone for BTreeMap<K, V> {
         if self.is_empty() {
             // Ideally we'd call `BTreeMap::new` here, but that has the `K:
             // Ord` constraint, which this method lacks.
-            BTreeMap { root: None, length: 0, alloc: PhantomData }
+            BTreeMap { root: None, length: 0 }
         } else {
             clone_subtree(self.root.as_ref().unwrap().as_ref())
         }

src/liballoc/collections/btree/node.rs

@@ -142,10 +142,11 @@ impl<K, V> BoxedNode<K, V> {
 /// An owned tree.
 ///
 /// Note that this does not have a destructor, and must be cleaned up manually.
-pub struct Root<K, V> {
+pub struct Root<K, V, A: AllocRef = Global> {
     node: BoxedNode<K, V>,
     /// The number of levels below the root node.
     height: usize,
+    alloc: PhantomData<A>,
 }
 
 unsafe impl<K: Sync, V: Sync> Sync for Root<K, V> {}
@@ -154,7 +155,11 @@ unsafe impl<K: Send, V: Send> Send for Root<K, V> {}
 impl<K, V> Root<K, V> {
     /// Returns a new owned tree, with its own root node that is initially empty.
     pub fn new_leaf() -> Self {
-        Root { node: BoxedNode::from_leaf(Box::new(unsafe { LeafNode::new() })), height: 0 }
+        Root {
+            node: BoxedNode::from_leaf(Box::new(unsafe { LeafNode::new() })),
+            height: 0,
+            alloc: PhantomData,
+        }
     }
 
     pub fn as_ref(&self) -> NodeRef<marker::Immut<'_>, K, V, marker::LeafOrInternal> {
@@ -174,7 +179,9 @@ impl<K, V> Root<K, V> {
             _marker: PhantomData,
         }
     }
+}
 
+impl<K, V, A: AllocRef> Root<K, V, A> {
     pub fn into_ref(self) -> NodeRef<marker::Owned, K, V, marker::LeafOrInternal> {
         NodeRef {
             height: self.height,
@@ -183,7 +190,9 @@ impl<K, V> Root<K, V> {
             _marker: PhantomData,
         }
     }
+}
 
+impl<K, V> Root<K, V> {
     /// Adds a new internal node with a single edge, pointing to the previous root, and make that
     /// new node the root. This increases the height by 1 and is the opposite of `pop_level`.
     pub fn push_level(&mut self) -> NodeRef<marker::Mut<'_>, K, V, marker::Internal> {
@@ -615,7 +624,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
                 ForceResult::Internal(internal) => {
                     let edge =
                         ptr::read(internal.as_internal().edges.get_unchecked(idx + 1).as_ptr());
-                    let mut new_root = Root { node: edge, height: internal.height - 1 };
+                    let mut new_root =
+                        Root { node: edge, height: internal.height - 1, alloc: PhantomData };
                     (*new_root.as_mut().as_leaf_mut()).parent = ptr::null();
                     Some(new_root)
                 }
@@ -647,7 +657,8 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::LeafOrInternal> {
                         0,
                     );
 
-                    let mut new_root = Root { node: edge, height: internal.height - 1 };
+                    let mut new_root =
+                        Root { node: edge, height: internal.height - 1, alloc: PhantomData };
                     (*new_root.as_mut().as_leaf_mut()).parent = ptr::null();
 
                     for i in 0..old_len {
@@ -1026,7 +1037,12 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Leaf>, marker::KV>
             (*self.node.as_leaf_mut()).len = self.idx as u16;
             new_node.len = new_len as u16;
 
-            (self.node, k, v, Root { node: BoxedNode::from_leaf(new_node), height: 0 })
+            (
+                self.node,
+                k,
+                v,
+                Root { node: BoxedNode::from_leaf(new_node), height: 0, alloc: PhantomData },
+            )
         }
     }
 
@@ -1081,7 +1097,8 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker::
             (*self.node.as_leaf_mut()).len = self.idx as u16;
             new_node.data.len = new_len as u16;
 
-            let mut new_root = Root { node: BoxedNode::from_internal(new_node), height };
+            let mut new_root =
+                Root { node: BoxedNode::from_internal(new_node), height, alloc: PhantomData };
 
             for i in 0..(new_len + 1) {
                 Handle::new_edge(new_root.as_mut().cast_unchecked(), i).correct_parent_link();

src/test/debuginfo/pretty-huge-vec.rs

@@ -10,22 +10,22 @@
 // gdb-command: run
 
 // gdb-command: print vec
-// gdb-check:$1 = Vec<u8>(len: 1000000000, cap: 1000000000) = {[...]...}
+// gdb-check:$1 = Vec<u8, alloc::alloc::Global>(len: 1000000000, cap: 1000000000) = {[...]...}
 
 // gdb-command: print slice
 // gdb-check:$2 = &[u8](len: 1000000000) = {[...]...}
 
-
 #![allow(unused_variables)]
 
 fn main() {
-
     // Vec
     let mut vec: Vec<u8> = Vec::with_capacity(1_000_000_000);
-    unsafe{ vec.set_len(1_000_000_000) }
+    unsafe { vec.set_len(1_000_000_000) }
     let slice = &vec[..];
 
     zzz(); // #break
 }
 
-fn zzz() { () }
+fn zzz() {
+    ()
+}

src/test/debuginfo/pretty-std-collections.rs

@@ -15,30 +15,30 @@
 // gdb-command: run
 
 // gdb-command: print btree_set
-// gdb-check:$1 = BTreeSet<i32>(len: 15) = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
+// gdb-check:$1 = BTreeSet<i32, alloc::alloc::Global>(len: 15) = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}
 
 // gdb-command: print empty_btree_set
-// gdb-check:$2 = BTreeSet<i32>(len: 0)
+// gdb-check:$2 = BTreeSet<i32, alloc::alloc::Global>(len: 0)
 
 // gdb-command: print btree_map
-// gdb-check:$3 = BTreeMap<i32, i32>(len: 15) = {[0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7, [8] = 8, [9] = 9, [10] = 10, [11] = 11, [12] = 12, [13] = 13, [14] = 14}
+// gdb-check:$3 = BTreeMap<i32, i32, alloc::alloc::Global>(len: 15) = {[0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 5, [6] = 6, [7] = 7, [8] = 8, [9] = 9, [10] = 10, [11] = 11, [12] = 12, [13] = 13, [14] = 14}
 
 // gdb-command: print empty_btree_map
-// gdb-check:$4 = BTreeMap<i32, u32>(len: 0)
+// gdb-check:$4 = BTreeMap<i32, u32, alloc::alloc::Global>(len: 0)
 
 // gdb-command: print option_btree_map
-// gdb-check:$5 = BTreeMap<bool, core::option::Option<bool>>(len: 2) = {[false] = [...], [true] = [...]}
+// gdb-check:$5 = BTreeMap<bool, core::option::Option<bool>, alloc::alloc::Global>(len: 2) = {[false] = [...], [true] = [...]}
 // (abbreviated because both values vary wildly over gdb versions and/or linux distributions)
 
 // gdb-command: print nasty_btree_map
-// gdb-check:$6 = BTreeMap<i32, pretty_std_collections::MyLeafNode>(len: 15) = {[0] = pretty_std_collections::MyLeafNode (0), [...]}
+// gdb-check:$6 = BTreeMap<i32, pretty_std_collections::MyLeafNode, alloc::alloc::Global>(len: 15) = {[0] = pretty_std_collections::MyLeafNode (0), [...]}
 // (abbreviated because it's boring but we need enough elements to include internal nodes)
 
 // gdb-command: print vec_deque
-// gdb-check:$7 = VecDeque<i32>(len: 3, cap: 8) = {5, 3, 7}
+// gdb-check:$7 = VecDeque<i32, alloc::alloc::Global>(len: 3, cap: 8) = {5, 3, 7}
 
 // gdb-command: print vec_deque2
-// gdb-check:$8 = VecDeque<i32>(len: 7, cap: 8) = {2, 3, 4, 5, 6, 7, 8}
+// gdb-check:$8 = VecDeque<i32, alloc::alloc::Global>(len: 7, cap: 8) = {2, 3, 4, 5, 6, 7, 8}
 
 #![allow(unused_variables)]
 use std::collections::BTreeMap;

src/test/debuginfo/pretty-uninitialized-vec.rs

@@ -10,17 +10,16 @@
 // gdb-command: run
 
 // gdb-command: print vec
-// gdb-check:$1 = Vec<i32>(len: [...], cap: [...])[...]
-
+// gdb-check:$1 = Vec<i32, alloc::alloc::Global>(len: [...], cap: [...])[...]
 
 #![allow(unused_variables)]
 
 fn main() {
-
     let vec;
     zzz(); // #break
     vec = vec![0];
-
 }
 
-fn zzz() { () }
+fn zzz() {
+    ()
+}

src/test/rustdoc/inline_cross/impl_trait.rs

@@ -4,7 +4,7 @@
 extern crate impl_trait_aux;
 
 // @has impl_trait/fn.func.html
-// @has - '//pre[@class="rust fn"]' "pub fn func<'a>(_x: impl Clone + Into<Vec<u8>> + 'a)"
+// @has - '//pre[@class="rust fn"]' "pub fn func<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)"
 // @!has - '//pre[@class="rust fn"]' 'where'
 pub use impl_trait_aux::func;
 
@@ -31,7 +31,7 @@ pub use impl_trait_aux::func4;
 pub use impl_trait_aux::async_fn;
 
 // @has impl_trait/struct.Foo.html
-// @has - '//code[@id="method.v"]' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8>> + 'a)"
+// @has - '//code[@id="method.v"]' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)"
 // @!has - '//code[@id="method.v"]' 'where'
 pub use impl_trait_aux::Foo;
 

src/test/ui/associated-types/defaults-suitability.stderr

@@ -131,7 +131,7 @@ LL |     type Ty = Vec<[u8]>;
    | 
   ::: $SRC_DIR/liballoc/vec.rs:LL:COL
    |
-LL | pub struct Vec<T> {
+LL | pub struct Vec<T, A: AllocRef = Global> {
    |                - required by this bound in `std::vec::Vec`
    |
    = help: the trait `std::marker::Sized` is not implemented for `[u8]`

src/test/ui/bad/bad-const-type.stderr

@@ -6,6 +6,9 @@ LL | static i: String = 10;
    |                    |
    |                    expected struct `std::string::String`, found integer
    |                    help: try using a conversion method: `10.to_string()`
+   |
+   = note: expected struct `std::string::String`
+                found type `{integer}`
 
 error: aborting due to previous error
 

src/test/ui/bad/bad-sized.stderr

@@ -17,7 +17,7 @@ LL |     let x: Vec<dyn Trait + Sized> = Vec::new();
    | 
   ::: $SRC_DIR/liballoc/vec.rs:LL:COL
    |
-LL | pub struct Vec<T> {
+LL | pub struct Vec<T, A: AllocRef = Global> {
    |                - required by this bound in `std::vec::Vec`
    |
    = help: the trait `std::marker::Sized` is not implemented for `dyn Trait`

src/test/ui/block-result/consider-removing-last-semi.stderr

@@ -8,6 +8,9 @@ LL | fn f() -> String {
 LL |     0u8;
 LL |     "bla".to_string();
    |                      - help: consider removing this semicolon
+   |
+   = note: expected struct `std::string::String`
+           found unit type `()`
 
 error[E0308]: mismatched types
   --> $DIR/consider-removing-last-semi.rs:6:11
@@ -19,6 +22,9 @@ LL | fn g() -> String {
 LL |     "this won't work".to_string();
 LL |     "removeme".to_string();
    |                           - help: consider removing this semicolon
+   |
+   = note: expected struct `std::string::String`
+           found unit type `()`
 
 error: aborting due to 2 previous errors