diff options
| author | bors <bors@rust-lang.org> | 2022-10-30 02:26:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-30 02:26:41 +0000 |
| commit | 4827ceecb9ee9bc0508fecf7059bcc134ca187d0 (patch) | |
| tree | 7a660a4b9d3b3ae656b091901ca420e28bcae907 /src/test/rustdoc | |
| parent | 15ee24a2fab6a29dd2235d7c4e383c9011f5900f (diff) | |
| parent | 9c5e61c2d257c2d1e7441e9675dbf2694dfbd2a2 (diff) | |
| download | rust-4827ceecb9ee9bc0508fecf7059bcc134ca187d0.tar.gz rust-4827ceecb9ee9bc0508fecf7059bcc134ca187d0.zip | |
Auto merge of #103745 - matthiaskrgr:rollup-hipjva8, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #100006 (Make `core::mem::copy` const) - #102659 (1.65.0 release notes) - #103124 (Add tests for autoderef on block tail) - #103253 (rustdoc: add test case for masked blanket impl) - #103715 (use consistent terminology) - #103722 (Fix z-indexes of code example feature and cleanup its CSS) - #103726 (Avoid unnecessary `&str` to `String` conversions) - #103737 (rustdoc: use CSS margin/padding shorthand when all are being set) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc')
| -rw-r--r-- | src/test/rustdoc/auxiliary/masked.rs | 4 | ||||
| -rw-r--r-- | src/test/rustdoc/masked.rs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/test/rustdoc/auxiliary/masked.rs b/src/test/rustdoc/auxiliary/masked.rs index f289359e52a..3d722d5e0c2 100644 --- a/src/test/rustdoc/auxiliary/masked.rs +++ b/src/test/rustdoc/auxiliary/masked.rs @@ -8,3 +8,7 @@ pub trait MaskedTrait { impl MaskedTrait for String { fn masked_method() {} } + +pub trait MaskedBlanketTrait {} + +impl<T> MaskedBlanketTrait for T {} diff --git a/src/test/rustdoc/masked.rs b/src/test/rustdoc/masked.rs index 80d5b99c0b0..875c026fd05 100644 --- a/src/test/rustdoc/masked.rs +++ b/src/test/rustdoc/masked.rs @@ -10,6 +10,7 @@ extern crate masked; // @!hasraw 'search-index.js' 'masked_method' // @!hasraw 'foo/struct.String.html' 'MaskedTrait' +// @!hasraw 'foo/struct.String.html' 'MaskedBlanketTrait' // @!hasraw 'foo/struct.String.html' 'masked_method' pub use std::string::String; |