rustdoc: Fix LinkReplacer link matching - #108459

Merged
bors merged 1 commit into
rust-lang:masterfrom
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged

rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom
benediktwerner:rustdoc-fix-link-match

Conversation

@benediktwerner

@benediktwernerbenediktwerner commented Feb 25, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

It currently just uses the first link with the same href which might not necessarily be the matching one.

This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.

@rustbot

rustbot commented Feb 25, 2023

Copy link
Copy Markdown
Collaborator

r? @jsha

(rustbot has picked a reviewer for you, use r? to override)

@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. labels Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner

benediktwerner commented Feb 26, 2023

Copy link
Copy Markdown
ContributorAuthor

Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.

I guess I'll also add a new test to explicitly check for the stuff this PR fixes.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez reviewed Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez reviewed Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez

GuillaumeGomez commented Mar 25, 2023

Copy link
Copy Markdown
Member

Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.

Anyway, just questions and then let's approve it. Thanks for working on this!

@GuillaumeGomez

GuillaumeGomez commented Mar 26, 2023

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@bors

bors commented Mar 26, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 8fed6df has been approved by GuillaumeGomez

It is now in the queue for this repository.

@bors

bors commented Mar 26, 2023

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@borsbors 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 26, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC mentioned this pull request Mar 27, 2023
Closed
@Dylan-DPC

Dylan-DPC commented Mar 27, 2023•
edited
Loading

Copy link
Copy Markdown
Member

failed in log of rollup

@bors

@borsbors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 27, 2023
@GuillaumeGomez

GuillaumeGomez commented Mar 27, 2023

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Mar 27, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez

GuillaumeGomez commented Mar 27, 2023

Copy link
Copy Markdown
Member

While we're at it, please squash your commits.

@bors r-

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 27, 2023
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 27, 2023
@JohnCSimon

JohnCSimon commented May 28, 2023

Copy link
Copy Markdown

@benediktwerner

ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!

FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.

@benediktwerner
benediktwernerforce-pushed the rustdoc-fix-link-match branch from c92d3ad to 9968f3cCompareMay 30, 2023 19:22
@benediktwerner

benediktwerner commented May 30, 2023

Copy link
Copy Markdown
ContributorAuthor

Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 30, 2023
@GuillaumeGomez

GuillaumeGomez commented May 31, 2023

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@bors

bors commented May 31, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 9968f3c has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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-review Status: Awaiting review from the assignee but also interested parties. labels May 31, 2023
@Dylan-DPCDylan-DPC mentioned this pull request Jun 1, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 0baa301 into rust-lang:masterJun 1, 2023
@rustbotrustbot added this to the 1.72.0 milestone Jun 1, 2023
@fmeasefmease mentioned this pull request Jun 7, 2023
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects

None yet

Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

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

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
rustdoc: Fix LinkReplacer link matching - #108459
Merged
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Jun 1, 2023
Merged
rustdoc: Fix LinkReplacer link matching#108459
bors merged 1 commit into
rust-lang:masterfrom 
benediktwerner:rustdoc-fix-link-match
Conversation
@benediktwerner
@benediktwernerbenediktwerner
commented
Feb 25, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. [X] and [struct@X]). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the original_lext[1..len() - 1] part when the first link only has a single character, which is why the new code uses .get(..) instead.
@rustbot
rustbot
commented
Feb 25, 2023

Copy link


Copy Markdown

Collaborator
r? @jsha
(rustbot has picked a reviewer for you, use r? to override)
@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.
labels
Feb 25, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@benediktwerner
benediktwerner
commented
Feb 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Hm, the failing test confused me a bit but I guess it's just wrong or written with this bug in mind? Swapping the two char links on MyString2 makes the prim@char show up as char (like it will after this PR even with the current order in the test). I adjusted it.
I guess I'll also add a new test to explicitly check for the stuff this PR fixes.
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
GuillaumeGomez
GuillaumeGomez
reviewed
Mar 25, 2023
View reviewed changes
Comment threadsrc/librustdoc/html/markdown.rs
@GuillaumeGomez
GuillaumeGomez
commented
Mar 25, 2023

Copy link


Copy Markdown

Member
Sorry for taking so long to review this fix. Don't hesitate to reroll it or ping someone else from the rustdoc team directly.
Anyway, just questions and then let's approve it. Thanks for working on this!
@GuillaumeGomez
GuillaumeGomez
commented
Mar 26, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 8fed6df has been approved by GuillaumeGomez
It is now in the queue for this repository.
@bors
bors
commented
Mar 26, 2023

Copy link


Copy Markdown

Collaborator
🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 26, 2023
Dylan-DPC added a commit
to Dylan-DPC/rust
that referenced
this pull request
Mar 27, 2023
@Dylan-DPC
Rollup merge ofrust-lang#108459- benediktwerner:rustdoc-fix-link-ma…
185cab3
…tch, r=GuillaumeGomez
rustdoc: Fix LinkReplacer link matching
It currently just uses the first link with the same href which might not necessarily be the matching one.
This fixes replacements when there are several links to the same item but with different text (e.g. `[X] and [struct@X]`). It also fixes replacements in summaries since those use a links list with empty hrefs, so currently all links would always match the first link by href but then not match its text. This could also lead to a panic in the `original_lext[1..len() - 1]` part when the first link only has a single character, which is why the new code uses `.get(..)` instead.
@Dylan-DPCDylan-DPC
mentioned this pull request
Mar 27, 2023
 Closed

@Dylan-DPC
Dylan-DPC
commented
Mar 27, 2023•

edited

Loading

Copy link


Copy Markdown

Member
failed in log of rollup
@bors
@borsbors
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-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
labels
Mar 27, 2023
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
@bors r+ rollup
@bors
bors
commented
Mar 27, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit c92d3adc108ba5979b4f9cb5b469a6e5adaa8518 has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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
Mar 27, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
GuillaumeGomez
commented
Mar 27, 2023

Copy link


Copy Markdown

Member
While we're at it, please squash your commits.
@bors r-
@borsbors
removed
the 
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
label
Mar 27, 2023
@borsbors
added
the 
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
label
Mar 27, 2023
@JohnCSimon
JohnCSimon
commented
May 28, 2023

Copy link


Copy Markdown

@benediktwerner
ping from triage - can you post your status on this PR? There hasn't been an update in a few months. Thanks!
FYI: when a PR is ready for review, send a message containing
@rustbot ready to switch to S-waiting-on-review so the PR is in the reviewer's backlog.
@benediktwerner
benediktwernerforce-pushed
the
rustdoc-fix-link-match
branch
from
c92d3ad to
9968f3cCompareMay 30, 2023 19:22
@benediktwerner
benediktwerner
commented
May 30, 2023

Copy link


Copy Markdown

ContributorAuthor
Ah, sorry, looks like I missed the changes here. Fixed the formatting and squashed the commits.
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
May 30, 2023
@GuillaumeGomez
GuillaumeGomez
commented
May 31, 2023

Copy link


Copy Markdown

Member
Thanks!
@bors r+ rollup
@bors
bors
commented
May 31, 2023

Copy link


Copy Markdown

Collaborator
📌 Commit 9968f3c has been approved by GuillaumeGomez
It is now in the queue for this repository.
@borsbors
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
May 31, 2023
@Dylan-DPCDylan-DPC
mentioned this pull request
Jun 1, 2023
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2023
@bors
Auto merge ofrust-lang#112164- Dylan-DPC:rollup-93zj7jw, r=Dylan-DPC
fabf929
Rollup of 7 pull requests
Successful merges:
- rust-lang#108459 (rustdoc: Fix LinkReplacer link matching)
- rust-lang#111318 (Add a distinct `OperandValue::ZeroSized` variant for ZSTs)
- rust-lang#111892 (rustdoc: add interaction delays for tooltip popovers)
- rust-lang#111980 (Preserve substs in opaques recorded in typeck results)
- rust-lang#112024 (Don't suggest break through nested items)
- rust-lang#112128 (Don't compute inlining status of mono items in advance.)
- rust-lang#112141 (remove reference to Into in ? operator core/std docs, fixrust-lang#111655)
Failed merges:
- rust-lang#112071 (Group rfcs tests)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 0baa301
into
rust-lang:masterJun 1, 2023
@rustbotrustbot
added this to the 1.72.0 milestone
Jun 1, 2023
@fmeasefmease
mentioned this pull request
Jun 7, 2023

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@jshajsha

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.

Projects


None yet


Milestone

1.72.0

Development

Successfully merging this pull request may close these issues.

8 participants

@benediktwerner@rustbot@rust-log-analyzer@GuillaumeGomez@bors@Dylan-DPC@JohnCSimon@jsha