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/rustdoc | |
| 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/rustdoc')
| -rw-r--r-- | src/test/rustdoc/inline_cross/impl_trait.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/rustdoc/inline_cross/impl_trait.rs b/src/test/rustdoc/inline_cross/impl_trait.rs index e3a166b3d0e..0ab2fa99f87 100644 --- a/src/test/rustdoc/inline_cross/impl_trait.rs +++ b/src/test/rustdoc/inline_cross/impl_trait.rs @@ -1,10 +1,11 @@ // aux-build:impl_trait_aux.rs // edition:2018 +// ignore-tidy-linelength 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 +32,7 @@ pub use impl_trait_aux::func4; pub use impl_trait_aux::async_fn; // @has impl_trait/struct.Foo.html -// @has - '//*[@id="method.method"]//code' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8>> + 'a)" +// @has - '//*[@id="method.method"]//code' "pub fn method<'a>(_x: impl Clone + Into<Vec<u8, Global>> + 'a)" // @!has - '//*[@id="method.method"]//code' 'where' pub use impl_trait_aux::Foo; |