diff options
| author | bors <bors@rust-lang.org> | 2022-08-14 01:29:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-14 01:29:58 +0000 |
| commit | b76fec3ca89ba255316c010065f1fcf4d7cbfc9c (patch) | |
| tree | cba22d8a87a62adfc69df8238b4658bcae39c783 /src/test/rustdoc/inline_local/please_inline.rs | |
| parent | 75b7e52e92c3b00fc891b47f5b2efdff0a2be55a (diff) | |
| parent | 860e093efb78ff67ae7f2cb9bbb69637295214a4 (diff) | |
| download | rust-b76fec3ca89ba255316c010065f1fcf4d7cbfc9c.tar.gz rust-b76fec3ca89ba255316c010065f1fcf4d7cbfc9c.zip | |
Auto merge of #100511 - compiler-errors:rollup-vrte4w5, r=compiler-errors
Rollup of 11 pull requests Successful merges: - #100355 (rustdoc: Rename ``@has` FILE PATTERN` to ``@hasraw` FILE PATTERN`) - #100407 (avoid some int2ptr casts in thread_local_key tests) - #100434 (Fix HIR pretty printing of let else) - #100438 (Erase regions better in `promote_candidate`) - #100445 (adapt test for msan message change) - #100447 (Remove more Clean trait implementations) - #100464 (Make `[rust] use-lld=true` work on windows) - #100475 (Give a helpful diagnostic when the next struct field has an attribute) - #100490 (wf: correctly `shallow_resolve` consts) - #100501 (nicer Miri backtraces for from_exposed_addr) - #100509 (merge two test directories that mean the same thing) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/rustdoc/inline_local/please_inline.rs')
| -rw-r--r-- | src/test/rustdoc/inline_local/please_inline.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/rustdoc/inline_local/please_inline.rs b/src/test/rustdoc/inline_local/please_inline.rs index 48539361fbf..e4429ef33a9 100644 --- a/src/test/rustdoc/inline_local/please_inline.rs +++ b/src/test/rustdoc/inline_local/please_inline.rs @@ -4,7 +4,7 @@ pub mod foo { // @has please_inline/a/index.html pub mod a { - // @!has - 'pub use foo::' + // @!hasraw - 'pub use foo::' // @has please_inline/a/struct.Foo.html #[doc(inline)] pub use foo::Foo; @@ -12,7 +12,7 @@ pub mod a { // @has please_inline/b/index.html pub mod b { - // @has - 'pub use foo::' + // @hasraw - 'pub use foo::' // @!has please_inline/b/struct.Foo.html #[feature(inline)] pub use foo::Foo; |