Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Move rustdoc ui doctests into the right testsuite by GuillaumeGomez · Pull Request #161978 · rust-lang/rust · GitHub
Skip to content

Move rustdoc ui doctests into the right testsuite - #161978

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest
Aug 30, 2026
Merged

Move rustdoc ui doctests into the right testsuite#161978
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
GuillaumeGomez:cleanup-ui-doctest

Conversation

@GuillaumeGomez

@GuillaumeGomezGuillaumeGomez commented Aug 29, 2026

Copy link
Copy Markdown
Member

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

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Aug 29, 2026

@GuillaumeGomezGuillaumeGomezAug 29, 2026

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The needed binary to run this test doesn't exist anymore. However we now have:

$ git grep -n test-runtoolrun-make/rustdoc/default-output/output-default.stdout:143: --test-runtool The tool to run tests with when building for a different target than hostrun-make/rustdoc/default-output/output-default.stdout:145: --test-runtool-arg One argument (of possibly many) to pass to the runtoolrun-make/rustdoc/doctest/runtool/rmake.rs:3:// Tests behavior of rustdoc `--test-runtool`.run-make/rustdoc/doctest/runtool/rmake.rs:16:// Behavior with --test-runtool with relative paths and --test-run-directory.run-make/rustdoc/doctest/runtool/rmake.rs:32: .arg("--test-runtool")run-make/rustdoc/doctest/test_harness/rmake.rs:26: .arg("--test-runtool")

So I think it's fine.

View changes since the review

Comment threadtests/rustdoc-ui/doctest/doctest-include-43153.stdout Outdated
Comment threadtests/rustdoc-ui/doctest/doctest-crate-attributes-38129.stdout Outdated

@fmeasefmease left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me once my comments are addressed

View changes since this review

Comment threadtests/rustdoc-ui/doctest/doctest-markdown-trailing-docblock-48377.rs Outdated
@fmeasefmease 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
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

@bors r=fmease rollup

@rust-bors

rust-borsBot commented Aug 29, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 0feecd6 has been approved by fmease

It is now in the queue for this repository.

@rust-borsrust-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
rust-borsBot pushed a commit that referenced this pull request Aug 29, 2026
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})
@rust-bors
rust-borsBot merged commit ce7aa01 into rust-lang:mainAug 30, 2026
13 checks passed
@rustbotrustbot added this to the 1.100.0 milestone Aug 30, 2026
rust-borsBot pushed a commit that referenced this pull request Aug 30, 2026
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
@GuillaumeGomez
GuillaumeGomez deleted the cleanup-ui-doctest branch August 30, 2026 13:56
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.T-rustdoc-frontendRelevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@GuillaumeGomez@rust-log-analyzer@fmease@rustbot