rustdoc: Take into account edition information for keyword highlighting by GuillaumeGomez · Pull Request #161944 · rust-lang/rust

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

GuillaumeGomez · 2026-08-28T17:40:58Z

Fixes#148221.

The only thing that was missing was passing down an Edition to the highlighter (and adding tests).

r? @fmease

GuillaumeGomez · 2026-08-28T22:38:46Z

Cleaned up all my mess. Ready for review.

fmease

Thanks! :)

I've also tested markdown input rustdoc *.md --edition * and that works, too, automatically.

Two nitpicks, otherwise r=me

View changes since this review

fmease · 2026-08-29T11:03:07Z

Isn't source-code-pages/ for testing the contents of source code pages *.rs.html only? Here however, we're testing how the code blocks are rendered on "API pages", aren't we?
IIRC this belongs into tests/rustdoc-html/doctest/.

Fair enough!

fmease · 2026-08-29T11:36:00Z

+ &code,
+ None,
+ None,
+ original_span.edition(),


Could you add a // NOTE: here that states that this is only "an approximation" or "best effort" since the edition of individual tokens contained in the expansion can differ from the "overarching edition" / the edition of the entire expansion (original_span.edition()).
And we can't fix that since code is just a String that was produced by rustc_ast_pretty meaning more precise edition information has been lost.
To give an example:
//@ edition: 2015#[macro_export]macro_rules! generate {($kw:ident) => {pubfn host(){let _ = $kw {};}};}
//@ edition: 2024 dependency::generate!(async);
Here, your PR doesn't highlight the async in the rendered expansion … let _ = async {} … since it uses the edition of the entire expansion (which is Rust 2015) but the async in the Rust 2015 expansion does actually refer to Rust 2024 keyword async and thus contains an async block, not a struct expression! That's because the keyword async originates from a Rust 2024 crate (root expansion).¹
I think that's perfectly acceptable for now but a NOTE would be nice.
Footnotes
Or vice versa: The dependency is Rust 2024 and the dependent is Rust 2015. In such a case, the keyword currently gets highlighted even though it shouldn't be. ↩

GuillaumeGomez · 2026-08-29T15:52:30Z

Applied suggestions (and mostly took your comment for the note because I think it's more than enough hehe).

GuillaumeGomez · 2026-08-29T17:26:59Z

@bors r=fmease rollup

rust-bors · 2026-08-29T17:27:01Z

📌 Commit 40dc901 has been approved by fmease

It is now in the queue for this repository.

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

…g, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixesrust-lang#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

… r=fmease Move rustdoc ui doctests into the right testsuite When working on rust-lang#161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

Rollup of 7 pull requests Successful merges: - #160941 (Enforce safety comments on `alloc`) - #161975 (Abort instead of unwinding out of an inconsistent BTreeMap::split_off) - #157968 (Preserve ambiguous glob lint for subtrait method picks) - #161514 (rework handling of doc attributes on macro calls) - #161944 (rustdoc: Take into account edition information for keyword highlighting) - #161974 (remove rustc_never_type_options attr remnants) - #161978 (Move rustdoc ui doctests into the right testsuite) Failed merges: - #161702 (Use `drop_guard` in some places in {core,alloc,std})

@fmease

Rollup merge of #161944 - GuillaumeGomez:keyword-highlighting, r=fmease rustdoc: Take into account edition information for keyword highlighting Fixes#148221. The only thing that was missing was passing down an `Edition` to the highlighter (and adding tests). r? @fmease

@fmease

Rollup merge of #161978 - GuillaumeGomez:cleanup-ui-doctest, r=fmease Move rustdoc ui doctests into the right testsuite When working on #161944 (comment), I realized that a lot of doctests in `rustdoc-html` testsuite were not in the correct testsuite, so moving them in the right location. Because you're the one who made me realize it, here goes @fmease (thanks!) :p r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

@fmease

…ease Move more `rustdoc-html` tests using `--test` into the right folder Follow-up of rust-lang#161944. I double-checked if more `rustdoc-html` tests were in the wrong folder and... yeah. So fixing that too. I'll send a patch to prevent that in the future (in `compiletest` I guess, doesn't seem like a `tidy` thing). Oh also second commit is me realizing that some ui tests were using `compile-args` (which doesn't exist anymore) and without `@`. Anyway, fixed that too. r? @fmease

rustbot assigned fmease Aug 28, 2026

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the keyword-highlighting branch from 1a83eb3 to 86c5df9Compare August 28, 2026 17:49

This comment has been minimized.
Sign in to view

GuillaumeGomez force-pushed the keyword-highlighting branch 2 times, most recently from 1e831c0 to 05a128cCompare August 28, 2026 21:04

GuillaumeGomez requested a review from fmease August 28, 2026 22:38

fmease mentioned this pull request Aug 29, 2026
rustdoc: Correctly handle when a macro generates multiple items in --generate-macro-expansion#161876
Merged

fmease approved these changes Aug 29, 2026
View reviewed changes

fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 29, 2026

GuillaumeGomez mentioned this pull request Aug 29, 2026
Move rustdoc ui doctests into the right testsuite #161978
Merged

rustdoc: Take into account edition information for keyword highlighting
40dc901

GuillaumeGomez force-pushed the keyword-highlighting branch from 05a128c to 40dc901Compare August 29, 2026 15:51

rust-borsBot added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 29, 2026

JonathanBrouwer mentioned this pull request Aug 29, 2026
Rollup of 5 pull requests #161985
Closed

JonathanBrouwer mentioned this pull request Aug 29, 2026
Rollup of 6 pull requests #161986
Closed

GuillaumeGomez mentioned this pull request Aug 29, 2026
Rollup of 7 pull requests #161990
Merged

rust-borsBot merged commit b41b7bb into rust-lang:mainAug 30, 2026
13 checks passed

rustbot added this to the 1.100.0 milestone Aug 30, 2026

GuillaumeGomez deleted the keyword-highlighting branch August 30, 2026 13:56

GuillaumeGomez mentioned this pull request Aug 30, 2026
Move more rustdoc-html tests using --test into the right folder #162014
Open