Fix relative extern URL depth on source pages by arferreira · Pull Request #153160 · rust-lang/rust

arferreira · 2026-02-27T02:25:55Z

Source pages with --extern-html-root-url pointing to a relative URL like ../ were generating links with one extra ../. So instead of ../../core/iter/index.html you'd get ../../../core/iter/index.html. Took a while to notice because htmldocck.py uses substring matching — ../../core/ is a substring of ../../../core/ so the test passed anyway.

Two root causes. remote_url_prefix was using cx.current.len() for depth, but during source rendering cx.current is empty — SourceCollector doesn't do module descent. Source pages live under src/<crate_name>/ so the real depth is 2, not 0. On top of that, make_href was trying to compensate by prepending root_path to relative remote URLs (there was a FIXME about this), which just made it worse — ../../ + ../core/iter/ = ../../../core/iter/.

Fix: added remote_item_depth(root_path, doc_depth) that counts ../ segments in root_path when present, falls back to doc_depth otherwise. With the right depth in remote_url_prefix, make_href no longer needs to touch remote URLs at all — so url_parts now returns is_remote = true for all Remote locations. Also renamed is_absolute → is_remote since the semantics were always about "don't modify this URL", not about whether it has a scheme.

Added !has assertions to the test so the wrong URL gets caught explicitly next time.

Follow-up to #152977.

r? @notriddle

rustbot · 2026-02-27T05:46:48Z

Reminder, once the PR becomes ready for a review, use @rustbot ready.

arferreira · 2026-02-27T12:47:03Z

@rustbot ready

notriddle · 2026-02-27T17:56:05Z

@bors r+

rust-bors · 2026-02-27T17:56:08Z

📌 Commit 6017689 has been approved by notriddle

It is now in the queue for this repository.

rustbot · 2026-03-12T00:32:02Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

notriddle · 2026-03-12T03:26:46Z

@bors r+

rust-bors · 2026-03-12T03:26:55Z

📌 Commit 59b37bb has been approved by notriddle

It is now in the queue for this repository.

@notriddle

… r=notriddle Fix relative extern URL depth on source pages Source pages with `--extern-html-root-url` pointing to a relative URL like `../` were generating links with one extra `../`. So instead of `../../core/iter/index.html` you'd get `../../../core/iter/index.html`. Took a while to notice because `htmldocck.py` uses substring matching — `../../core/` is a substring of `../../../core/` so the test passed anyway. Two root causes. `remote_url_prefix` was using `cx.current.len()` for depth, but during source rendering `cx.current` is empty — `SourceCollector` doesn't do module descent. Source pages live under `src/<crate_name>/` so the real depth is 2, not 0. On top of that, `make_href` was trying to compensate by prepending `root_path` to relative remote URLs (there was a FIXME about this), which just made it worse — `../../` + `../core/iter/` = `../../../core/iter/`. Fix: added `remote_item_depth(root_path, doc_depth)` that counts `../` segments in `root_path` when present, falls back to `doc_depth` otherwise. With the right depth in `remote_url_prefix`, `make_href` no longer needs to touch remote URLs at all — so `url_parts` now returns `is_remote = true` for all `Remote` locations. Also renamed `is_absolute` → `is_remote` since the semantics were always about "don't modify this URL", not about whether it has a scheme. Added `!has` assertions to the test so the wrong URL gets caught explicitly next time. Follow-up to #152977. r? @notriddle

rust-bors · 2026-03-12T04:16:15Z

💔 Test for e95d0cd failed: CI. Failed job:

auto - x86_64-mingw-2 (web logs, enhanced plaintext logs)

Zalathar · 2026-03-12T04:45:01Z

@bors retry

@notriddle

…-root-path, r=notriddle Fix relative extern URL depth on source pages Source pages with `--extern-html-root-url` pointing to a relative URL like `../` were generating links with one extra `../`. So instead of `../../core/iter/index.html` you'd get `../../../core/iter/index.html`. Took a while to notice because `htmldocck.py` uses substring matching — `../../core/` is a substring of `../../../core/` so the test passed anyway. Two root causes. `remote_url_prefix` was using `cx.current.len()` for depth, but during source rendering `cx.current` is empty — `SourceCollector` doesn't do module descent. Source pages live under `src/<crate_name>/` so the real depth is 2, not 0. On top of that, `make_href` was trying to compensate by prepending `root_path` to relative remote URLs (there was a FIXME about this), which just made it worse — `../../` + `../core/iter/` = `../../../core/iter/`. Fix: added `remote_item_depth(root_path, doc_depth)` that counts `../` segments in `root_path` when present, falls back to `doc_depth` otherwise. With the right depth in `remote_url_prefix`, `make_href` no longer needs to touch remote URLs at all — so `url_parts` now returns `is_remote = true` for all `Remote` locations. Also renamed `is_absolute` → `is_remote` since the semantics were always about "don't modify this URL", not about whether it has a scheme. Added `!has` assertions to the test so the wrong URL gets caught explicitly next time. Follow-up to rust-lang#152977. r? @notriddle

@notriddle

…-root-path, r=notriddle Fix relative extern URL depth on source pages Source pages with `--extern-html-root-url` pointing to a relative URL like `../` were generating links with one extra `../`. So instead of `../../core/iter/index.html` you'd get `../../../core/iter/index.html`. Took a while to notice because `htmldocck.py` uses substring matching — `../../core/` is a substring of `../../../core/` so the test passed anyway. Two root causes. `remote_url_prefix` was using `cx.current.len()` for depth, but during source rendering `cx.current` is empty — `SourceCollector` doesn't do module descent. Source pages live under `src/<crate_name>/` so the real depth is 2, not 0. On top of that, `make_href` was trying to compensate by prepending `root_path` to relative remote URLs (there was a FIXME about this), which just made it worse — `../../` + `../core/iter/` = `../../../core/iter/`. Fix: added `remote_item_depth(root_path, doc_depth)` that counts `../` segments in `root_path` when present, falls back to `doc_depth` otherwise. With the right depth in `remote_url_prefix`, `make_href` no longer needs to touch remote URLs at all — so `url_parts` now returns `is_remote = true` for all `Remote` locations. Also renamed `is_absolute` → `is_remote` since the semantics were always about "don't modify this URL", not about whether it has a scheme. Added `!has` assertions to the test so the wrong URL gets caught explicitly next time. Follow-up to rust-lang#152977. r? @notriddle

Rollup of 7 pull requests Successful merges: - #153736 (add test that an incomplete feature emits a warning) - #153160 (Fix relative extern URL depth on source pages) - #153432 (Fix some comments about dataflow analysis.) - #153694 (fix(query): Pass Query Key to `value_from_cycle_error`) - #153717 (unused_macro_rules switched used and unused comments) - #153748 (editorconfig: css uses tabs) - #153750 (rustc-dev-guide subtree update)

rust-bors · 2026-03-12T09:37:21Z

⌛ Testing commit 59b37bb with merge c66e4b8...

Workflow: https://github.com/rust-lang/rust/actions/runs/22995536645

@notriddle

… r=notriddle Fix relative extern URL depth on source pages Source pages with `--extern-html-root-url` pointing to a relative URL like `../` were generating links with one extra `../`. So instead of `../../core/iter/index.html` you'd get `../../../core/iter/index.html`. Took a while to notice because `htmldocck.py` uses substring matching — `../../core/` is a substring of `../../../core/` so the test passed anyway. Two root causes. `remote_url_prefix` was using `cx.current.len()` for depth, but during source rendering `cx.current` is empty — `SourceCollector` doesn't do module descent. Source pages live under `src/<crate_name>/` so the real depth is 2, not 0. On top of that, `make_href` was trying to compensate by prepending `root_path` to relative remote URLs (there was a FIXME about this), which just made it worse — `../../` + `../core/iter/` = `../../../core/iter/`. Fix: added `remote_item_depth(root_path, doc_depth)` that counts `../` segments in `root_path` when present, falls back to `doc_depth` otherwise. With the right depth in `remote_url_prefix`, `make_href` no longer needs to touch remote URLs at all — so `url_parts` now returns `is_remote = true` for all `Remote` locations. Also renamed `is_absolute` → `is_remote` since the semantics were always about "don't modify this URL", not about whether it has a scheme. Added `!has` assertions to the test so the wrong URL gets caught explicitly next time. Follow-up to #152977. r? @notriddle

Zalathar · 2026-03-12T10:27:22Z

Failed in rollup: #153761 (comment)

@bors r-

rust-bors · 2026-03-12T10:27:29Z

This pull request was unapproved.

This PR was contained in a rollup (#153761), which was unapproved.

Auto build was cancelled due to unapproval. Cancelled workflows:

https://github.com/rust-lang/rust/actions/runs/22995536645

Zalathar · 2026-03-12T10:56:47Z

@bors try jobs=dist-x86_64-linux-alt

… r=<try> Fix relative extern URL depth on source pages try-job: dist-x86_64-linux-alt

rust-bors · 2026-03-12T13:33:16Z

☀️ Try build successful (CI)
Build commit: 052b44b (052b44bdc2f95e775fc97e3f8679c579d666f71a, parent: d1ee5e59a964a419b84b760812a35075034f4861)

rust-bors · 2026-08-30T00:18:00Z

☔ The latest upstream changes (presumably #161990) made this pull request unmergeable. Please resolve the merge conflicts by rebasing.

rustbot assigned notriddle Feb 27, 2026

This comment has been minimized.

Sign in to view

arferreira force-pushed the fix-relative-extern-url-root-path branch from 372a8c7 to d71f355 Compare February 27, 2026 02:32

arferreira mentioned this pull request Feb 27, 2026

Re-enable relative paths for std links in rustc-docs #153162

Open

notriddle requested changes Feb 27, 2026

View reviewed changes

Comment thread src/librustdoc/html/format.rs Outdated

rustbot 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 Feb 27, 2026

arferreira force-pushed the fix-relative-extern-url-root-path branch from d71f355 to bfeb902 Compare February 27, 2026 12:01

rustbot 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 Feb 27, 2026

This comment has been minimized.

Sign in to view

arferreira force-pushed the fix-relative-extern-url-root-path branch from 0f28723 to 6017689 Compare February 27, 2026 14:54

notriddle approved these changes Feb 27, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

Fix relative extern URL depth on source pages

59b37bb

arferreira force-pushed the fix-relative-extern-url-root-path branch from 6017689 to 59b37bb Compare March 12, 2026 00:31

rust-bors Bot 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 12, 2026

This comment has been minimized.

Sign in to view

rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 12, 2026

TKanX mentioned this pull request Mar 12, 2026

Rollup of 4 pull requests #153753

Closed

This comment has been minimized.

Sign in to view

rust-bors Bot 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 12, 2026

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 5 pull requests #153757

Closed

Zalathar mentioned this pull request Mar 12, 2026

Rollup of 7 pull requests #153761

Closed

rust-bors Bot 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 12, 2026

Escape brackets in doc comment to fix rustdoc warning

1369e07

This comment has been minimized.

Sign in to view

rust-bors Bot pushed a commit that referenced this pull request Mar 12, 2026

Auto merge of #153160 - arferreira:fix-relative-extern-url-root-path,…

052b44b

… r=<try> Fix relative extern URL depth on source pages try-job: dist-x86_64-linux-alt

Uh oh!

Uh oh!

Conversation

arferreira commented Feb 27, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment has been minimized.

Uh oh!

rustbot commented Feb 27, 2026

Uh oh!

This comment has been minimized.

arferreira commented Feb 27, 2026

Uh oh!

This comment has been minimized.

notriddle commented Feb 27, 2026

Uh oh!

rust-bors Bot commented Feb 27, 2026

Uh oh!

This comment has been minimized.

rustbot commented Mar 12, 2026

Uh oh!

notriddle commented Mar 12, 2026

Uh oh!

rust-bors Bot commented Mar 12, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Mar 12, 2026

Uh oh!

This comment has been minimized.

Zalathar commented Mar 12, 2026

Uh oh!

rust-bors Bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Zalathar commented Mar 12, 2026

Uh oh!

rust-bors Bot commented Mar 12, 2026

Uh oh!

Zalathar commented Mar 12, 2026

Uh oh!

This comment has been minimized.

rust-bors Bot commented Mar 12, 2026

Uh oh!

rust-bors Bot commented Aug 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

arferreira commented Feb 27, 2026 •

edited by rustbot

Loading

rust-bors Bot commented Mar 12, 2026 •

edited

Loading