Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(trim-paths): rustdoc supports trim-paths for diagnostics #14389

Merged
merged 3 commits into from
Aug 12, 2024
Merged

feat(trim-paths): rustdoc supports trim-paths for diagnostics #14389

merged 3 commits into from
Aug 12, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

Part of #12137

This enables rustdoc invocation from cargo doc to trim paths
in diagnostics.

How should we test and review this PR?

Tests were added and followed by the behavior changing commit.

Additional information

Doc tests are out-of-scope, as they are handled
in a different mechanism, which needs more cares.

@weihanglo
refactor: extract remap rules into functions
0a752c6
@weihanglo
test: show trim-paths=diagnostics doesnt works for rustdoc
33a800c 
It should be working with the next commit.
@weihanglo
feat(trim-paths): rustdoc supports trim-paths for diagnostics
b8a3dbe 
This enables rustdoc invocation from `cargo doc` to trim paths
in diagnostics. Doc tests are out-of-scope, as they are handled
in a different mechanism, which needs more cares.
@weihanglo weihanglo added the Z-trim-paths Nightly: path sanitization label Aug 12, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 12, 2024

r? @epage

rustbot has assigned @epage.
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

@rustbot rustbot added A-build-execution Area: anything dealing with executing the compiler S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 12, 2024
@weihanglo weihanglo changed the title refactor: extract remap rules into functions feat(trim-paths): rustdoc supports trim-paths for diagnostics Aug 12, 2024
@weihanglo weihanglo mentioned this pull request Aug 12, 2024
Open
6 tasks
@epage
Copy link
Contributor

epage commented Aug 12, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 12, 2024

📌 Commit b8a3dbe has been approved by epage

It is now in the queue for this repository.

@bors bors 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 Aug 12, 2024
@bors
Copy link
Collaborator

bors commented Aug 12, 2024

⌛ Testing commit b8a3dbe with merge 3bd891d...

bors added a commit that referenced this pull request Aug 12, 2024
@bors
Auto merge of #14389 - weihanglo:rustdoc, r=epage
3bd891d 
feat(trim-paths): rustdoc supports trim-paths for diagnostics
@bors
Copy link
Collaborator

bors commented Aug 12, 2024

💔 Test failed - checks-actions

@bors bors 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 Aug 12, 2024
@weihanglo
Copy link
Member Author 

---- everything stdout ----
error: test failed, to rerun pass `-p rustfix --test parse_and_replace`
failed: ./tests/everything/use-insert.rs
thread 'everything' panicked at crates/rustfix/tests/parse_and_replace.rs:264:9:
1 out of 9 fixture asserts failed
(run with `env RUST_LOG=parse_and_replace=info` to get more details)
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace

Can't reproduce the error. Flaky I believe.

@bors retry

@bors bors 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 Aug 12, 2024
@bors
Copy link
Collaborator

bors commented Aug 12, 2024

⌛ Testing commit b8a3dbe with merge 94935a0...

@bors
Copy link
Collaborator

bors commented Aug 12, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing 94935a0 to master...

@bors bors merged commit 94935a0 into rust-lang:master Aug 12, 2024
22 checks passed
@weihanglo weihanglo deleted the rustdoc branch August 12, 2024 21:19
@weihanglo weihanglo mentioned this pull request Aug 13, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 14, 2024
@bors
Auto merge of rust-lang#129066 - weihanglo:update-cargo, r=weihanglo
9af6a95 
Update cargo

7 commits in 0d8d22f83b066503f6b2b755925197e959e58b4f..2f738d617c6ead388f899802dd1a7fd66858a691
2024-08-08 12:54:24 +0000 to 2024-08-13 10:57:52 +0000
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#14391)
- feat(trim-paths): rustdoc supports trim-paths for diagnostics (rust-lang/cargo#14389)
- Use longhand gitoxide path-spec patterns (rust-lang/cargo#14380)
- feat: Add `info` cargo subcommand (rust-lang/cargo#14141)
- CI: Switch macos aarch64 to nightly (rust-lang/cargo#14382)
- Use context instead of with_context (rust-lang/cargo#14377)
- Fix: `cargo package` failed on bare commit git repo. (rust-lang/cargo#14359)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 14, 2024
@bors
Auto merge of rust-lang#129066 - weihanglo:update-cargo, r=weihanglo
9594488 
Update cargo

7 commits in 0d8d22f83b066503f6b2b755925197e959e58b4f..2f738d617c6ead388f899802dd1a7fd66858a691
2024-08-08 12:54:24 +0000 to 2024-08-13 10:57:52 +0000
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#14391)
- feat(trim-paths): rustdoc supports trim-paths for diagnostics (rust-lang/cargo#14389)
- Use longhand gitoxide path-spec patterns (rust-lang/cargo#14380)
- feat: Add `info` cargo subcommand (rust-lang/cargo#14141)
- CI: Switch macos aarch64 to nightly (rust-lang/cargo#14382)
- Use context instead of with_context (rust-lang/cargo#14377)
- Fix: `cargo package` failed on bare commit git repo. (rust-lang/cargo#14359)

r? ghost
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 15, 2024
@bors
Auto merge of rust-lang#129066 - weihanglo:update-cargo, r=weihanglo
c416a6f 
Update cargo

7 commits in 0d8d22f83b066503f6b2b755925197e959e58b4f..2f738d617c6ead388f899802dd1a7fd66858a691
2024-08-08 12:54:24 +0000 to 2024-08-13 10:57:52 +0000
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#14391)
- feat(trim-paths): rustdoc supports trim-paths for diagnostics (rust-lang/cargo#14389)
- Use longhand gitoxide path-spec patterns (rust-lang/cargo#14380)
- feat: Add `info` cargo subcommand (rust-lang/cargo#14141)
- CI: Switch macos aarch64 to nightly (rust-lang/cargo#14382)
- Use context instead of with_context (rust-lang/cargo#14377)
- Fix: `cargo package` failed on bare commit git repo. (rust-lang/cargo#14359)

r? ghost
@rustbot rustbot added this to the 1.82.0 milestone Aug 15, 2024
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 29, 2024
@bors
Auto merge of #129066 - weihanglo:update-cargo, r=weihanglo
8e1bc89 
Update cargo

7 commits in 0d8d22f83b066503f6b2b755925197e959e58b4f..2f738d617c6ead388f899802dd1a7fd66858a691
2024-08-08 12:54:24 +0000 to 2024-08-13 10:57:52 +0000
- chore: downgrade to openssl v1.1.1 (again) (rust-lang/cargo#14391)
- feat(trim-paths): rustdoc supports trim-paths for diagnostics (rust-lang/cargo#14389)
- Use longhand gitoxide path-spec patterns (rust-lang/cargo#14380)
- feat: Add `info` cargo subcommand (rust-lang/cargo#14141)
- CI: Switch macos aarch64 to nightly (rust-lang/cargo#14382)
- Use context instead of with_context (rust-lang/cargo#14377)
- Fix: `cargo package` failed on bare commit git repo. (rust-lang/cargo#14359)

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

@epage epage

Labels
A-build-execution Area: anything dealing with executing the compiler S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. Z-trim-paths Nightly: path sanitization
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
4 participants
@weihanglo @rustbot @epage @bors