Skip to content

Conversation

@GuillaumeGomez
Copy link
Member

Needed for CI of rust-lang/rust#150055 to pass. Also: I used a full URL instead of a relative path to avoid this can kind of issues in the future since cargo is a submodule and not a subtree.

@rustbot rustbot added A-documenting-cargo-itself Area: Cargo's documentation S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2025
@rustbot
Copy link
Collaborator

rustbot commented Dec 16, 2025

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

[regex-docs-rs]: https://docs.rs/regex/1.4.2/regex/#crate-features
[sccache]: https://github.com/mozilla/sccache/blob/0.2.13/README.md#build-requirements
[`doc_cfg`]: ../../unstable-book/language-features/doc-cfg.html
[`doc_cfg`]: https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html#doccfg-and-docauto_cfg
Copy link
Member

Choose a reason for hiding this comment

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

#doccfg-and-docauto_cfg

Do we have this anchor?

Copy link
Member Author

@GuillaumeGomez GuillaumeGomez Dec 16, 2025

Choose a reason for hiding this comment

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

Not yet, but I don't really see a solution since CI for the stabilization will fail until this link is fixed... but it requires to have a wrong link in here until then.

[regex-docs-rs]: https://docs.rs/regex/1.4.2/regex/#crate-features
[sccache]: https://github.com/mozilla/sccache/blob/0.2.13/README.md#build-requirements
[`doc_cfg`]: ../../unstable-book/language-features/doc-cfg.html
[`doc_cfg`]: https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html#doccfg-and-docauto_cfg
Copy link
Member

Choose a reason for hiding this comment

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

We use relative paths so versioned doc jumps to versioned doc.

Suggested change
[`doc_cfg`]: https://doc.rust-lang.org/rustdoc/write-documentation/the-doc-attribute.html#doccfg-and-docauto_cfg
[`doc_cfg`]: ../../rustdoc/write-documentation/the-doc-attribute.html#doccfg-and-docauto_cfg

Copy link
Member Author

Choose a reason for hiding this comment

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

As you prefer.

@GuillaumeGomez
Copy link
Member Author

I simply removed the link, like that we don't need to some back and front between here and the Rust repository.

Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

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

Thanks. Feel free to add it back when needed :)

View changes since this review

@weihanglo weihanglo enabled auto-merge December 16, 2025 15:57
@0xPoe
Copy link
Member

0xPoe commented Dec 16, 2025

Failed test:

failures:

---- cache_lock::mutate_then_download stdout ----

thread 'cache_lock::mutate_then_download' (6808) panicked at tests\testsuite\cache_lock.rs:15:5:
test did not finish within 10 attempts (1.0023997s total)


failures:
    cache_lock::mutate_then_download

test result: FAILED. 3969 passed; 1 failed; 24 ignored; 0 measured; 0 filtered out; finished in 923.27s

@weihanglo weihanglo added this pull request to the merge queue Dec 16, 2025
Merged via the queue into rust-lang:master with commit a6228ba Dec 16, 2025
50 of 56 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 16, 2025
@GuillaumeGomez GuillaumeGomez deleted the fix-doc_cfg-link branch December 17, 2025 10:06
bors added a commit to rust-lang/rust that referenced this pull request Dec 20, 2025
Update cargo submodule

13 commits in e91b2baa632c0c7e84216c91ecfe107c37d887c1..3861f60f6b58f57524c0e7aab1f5c1ad83e35409
2025-12-13 16:29:21 +0000 to 2025-12-19 21:53:33 +0000
- fix(sbom): Don't set CARGO_SBOM_PATH when empty (like stable)  (rust-lang/cargo#16419)
- chore(ci): report-timings to upload HTML report (rust-lang/cargo#16416)
- fix(report): get the same feature parity of `--timings` (rust-lang/cargo#16414)
- fix(docs): Document the only possible values for DEBUG in build scripts (rust-lang/cargo#16413)
- fix(log): emit fingeprint log also for no-rebuild unit (rust-lang/cargo#16408)
- Fix link to `doc_cfg` docs in cargo book (rust-lang/cargo#16404)
- Add best pratice for how to check in generated files (rust-lang/cargo#16405)
- test: Use a larger default term width (rust-lang/cargo#16403)
- Document more services and permissions of the cargo team (rust-lang/cargo#16402)
- fix(new): Improve quality of package name error messages (rust-lang/cargo#16398)
- feat(log): add more log events (rust-lang/cargo#16390)
- chore: bump to 0.95.0; update changelog (rust-lang/cargo#16395)
- Cache submodule into git db (rust-lang/cargo#16246)

r? ghost
@rustbot rustbot added this to the 1.94.0 milestone Dec 20, 2025
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 21, 2025
Update cargo submodule

13 commits in e91b2baa632c0c7e84216c91ecfe107c37d887c1..3861f60f6b58f57524c0e7aab1f5c1ad83e35409
2025-12-13 16:29:21 +0000 to 2025-12-19 21:53:33 +0000
- fix(sbom): Don't set CARGO_SBOM_PATH when empty (like stable)  (rust-lang/cargo#16419)
- chore(ci): report-timings to upload HTML report (rust-lang/cargo#16416)
- fix(report): get the same feature parity of `--timings` (rust-lang/cargo#16414)
- fix(docs): Document the only possible values for DEBUG in build scripts (rust-lang/cargo#16413)
- fix(log): emit fingeprint log also for no-rebuild unit (rust-lang/cargo#16408)
- Fix link to `doc_cfg` docs in cargo book (rust-lang/cargo#16404)
- Add best pratice for how to check in generated files (rust-lang/cargo#16405)
- test: Use a larger default term width (rust-lang/cargo#16403)
- Document more services and permissions of the cargo team (rust-lang/cargo#16402)
- fix(new): Improve quality of package name error messages (rust-lang/cargo#16398)
- feat(log): add more log events (rust-lang/cargo#16390)
- chore: bump to 0.95.0; update changelog (rust-lang/cargo#16395)
- Cache submodule into git db (rust-lang/cargo#16246)

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

Labels

A-documenting-cargo-itself Area: Cargo's documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants