forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of rust-lang#121689 - GuillaumeGomez:rustdoc-highlightin…
…g-whitespace, r=notriddle [rustdoc] Prevent inclusion of whitespace character after macro_rules ident Discovered this bug randomly when looking at: ![image](https://github.com/rust-lang/rust/assets/3050060/dca38047-9085-4377-bfac-f98890224be4) We were too eagerly trying to merge tokens that shouldn't be merged together (for example if you have a code comment followed by a code comment, we merge them in one attribute to reduce the DOM size). r? `@notriddle`
- Loading branch information
Showing
3 changed files
with
31 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
// We need this option to be enabled for the `foo` macro declaration to ensure | ||
// that the link on the ident is not including whitespace characters. | ||
|
||
//@ compile-flags: -Zunstable-options --generate-link-to-definition | ||
#![crate_name = "foo"] | ||
|
||
// @has 'src/foo/source-code-highlight.rs.html' | ||
|
||
// @hasraw - '<a href="../../foo/macro.foo.html">foo</a>' | ||
#[macro_export] | ||
macro_rules! foo { | ||
() => {} | ||
} | ||
|
||
// @hasraw - '<span class="macro">foo!</span>' | ||
foo! {} | ||
|
||
// @hasraw - '<a href="../../foo/fn.f.html">f</a>' | ||
#[rustfmt::skip] | ||
pub fn f () {} | ||
// @hasraw - '<a href="../../foo/struct.Bar.html">Bar</a>' | ||
// @hasraw - '<a href="../../foo/struct.Bar.html">Bar</a>' | ||
// @hasraw - '<a href="https://doc.rust-lang.org/nightly/std/primitive.u32.html">u32</a>' | ||
#[rustfmt::skip] | ||
pub struct Bar ( u32 ); | ||
// @hasraw - '<a href="../../foo/enum.Foo.html">Foo</a>' | ||
pub enum Foo { | ||
A, | ||
} |