diff options
| author | bors <bors@rust-lang.org> | 2020-11-21 22:46:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-21 22:46:50 +0000 |
| commit | a1a13b2bc4fa6370b9501135d97c5fe0bc401894 (patch) | |
| tree | 6b0b0279e069cf0d343040eeb9c917637dd2bd93 /src/test/debuginfo | |
| parent | da384694807172f0ca40eca2e49a11688aba6e93 (diff) | |
| parent | a600410f4f005151b34aca5d3371144943104a5f (diff) | |
| download | rust-a1a13b2bc4fa6370b9501135d97c5fe0bc401894.tar.gz rust-a1a13b2bc4fa6370b9501135d97c5fe0bc401894.zip | |
Auto merge of #78461 - TimDiekmann:vec-alloc, r=Amanieu
Add support for custom allocators in `Vec` This follows the [roadmap](https://github.com/rust-lang/wg-allocators/issues/7) of the allocator WG to add custom allocators to collections. r? `@Amanieu` This pull request requires a crater run. ### Prior work: - #71873: Crater-test to solve rust-lang/wg-allocators#1 - [`alloc-wg`](https://github.com/TimDiekmann/alloc-wg)-crate
Diffstat (limited to 'src/test/debuginfo')
| -rw-r--r-- | src/test/debuginfo/pretty-std.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/debuginfo/pretty-std.rs b/src/test/debuginfo/pretty-std.rs index 7ae82d522b0..6632488171d 100644 --- a/src/test/debuginfo/pretty-std.rs +++ b/src/test/debuginfo/pretty-std.rs @@ -13,7 +13,7 @@ // gdb-check:$1 = &[i32](len: 4) = {0, 1, 2, 3} // gdb-command: print vec -// gdb-check:$2 = Vec<u64>(len: 4, cap: [...]) = {4, 5, 6, 7} +// gdb-check:$2 = Vec<u64, alloc::alloc::Global>(len: 4, cap: [...]) = {4, 5, 6, 7} // gdb-command: print str_slice // gdb-check:$3 = "IAMA string slice!" @@ -74,7 +74,7 @@ // NOTE: While slices have a .natvis entry that works in VS & VS Code, it fails in CDB 10.0.18362.1 // cdb-command: dx vec,d -// cdb-check:vec,d [...] : { size=4 } [Type: [...]::Vec<u64>] +// cdb-check:vec,d [...] : { size=4 } [Type: [...]::Vec<u64, alloc::alloc::Global>] // cdb-check: [size] : 4 [Type: [...]] // cdb-check: [capacity] : [...] [Type: [...]] // cdb-check: [0] : 4 [Type: unsigned __int64] |