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.

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

chore: tracing be compat with rustc_log #13239

Merged
merged 1 commit into from Jan 2, 2024

Conversation

weihanglo
Copy link
Member

What does this PR try to resolve?

The current version of rustfix cannot be used in rust-lang/rust due to the dependency on tracing. tracing-core is currently locked to 0.1.30, which is too old for the version in the cargo repo (it looks like they are trying to avoid a known deadlock).

See: https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/rustfix.20is.20incompatible.20with.20rust-lang.2Frust

Additional information

I guess we need a beta-backport for this?

The current version of rustfix cannot be used in rust-lang/rust due
to the dependency on `tracing`. `tracing-core` is currently locked
to 0.1.30, which is too old for the version in the cargo repo
(it looks like they are trying to avoid a known deadlock).

See: https://rust-lang.zulipchat.com/#narrow/stream/246057-t-cargo/topic/rustfix.20is.20incompatible.20with.20rust-lang.2Frust
@rustbot
Copy link
Collaborator

rustbot commented Jan 2, 2024

r? @epage

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

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 2, 2024
Copy link
Contributor

@epage epage left a comment

Choose a reason for hiding this comment

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

Thoughts on also holding back the version in Cargo.toml to keep the version we test and use in production the same as rustc?

Either way, feel free to r= me

@weihanglo
Copy link
Member Author

I am not sure if the deadlock is universal or rustc specific. Let's merge this, and if it is too bad we can pin the version then.

@bors r=epage

@bors
Copy link
Collaborator

bors commented Jan 2, 2024

📌 Commit 54e83c2 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 Jan 2, 2024
@bors
Copy link
Collaborator

bors commented Jan 2, 2024

⌛ Testing commit 54e83c2 with merge b41f084...

@bors
Copy link
Collaborator

bors commented Jan 2, 2024

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

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 2, 2024

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

@bors bors merged commit b41f084 into rust-lang:master Jan 2, 2024
22 checks passed
@bors
Copy link
Collaborator

bors commented Jan 2, 2024

👀 Test was successful, but fast-forwarding failed: 422 Changes must be made through a pull request.

bors added a commit that referenced this pull request Jan 2, 2024
[beta-1.76.0] chore: tracing be compat with rustc_log

Beta backports:

- <#13239>

In order to make CI pass, the following PRs are also cherry-picked:

-
@weihanglo weihanglo deleted the tracing-core branch January 2, 2024 23:24
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2024
Update cargo

10 commits in add15366eaf3f3eb84717d3b8b71902ca36a7c84..2ce45605d9db521b5fd6c1211ce8de6055fdb24e
2024-01-02 03:24:42 +0000 to 2024-01-04 18:04:13 +0000
- feat(embedded): Add prefix-char frontmatter syntax support (rust-lang/cargo#13247)
- Update dependency handlebars to v5 for mdman. (rust-lang/cargo#13249)
- Deprecate rustc plugin support in cargo (rust-lang/cargo#13248)
- feat(embedded): Add multiple experimental manifest syntaxes (rust-lang/cargo#13241)
- chore: update auto labels (rust-lang/cargo#13244)
- test: support publish package with a `public` field. (rust-lang/cargo#13245)
- `cargo fix`: Call rustc fewer times. (rust-lang/cargo#13243)
- chore: tracing be compat with rustc_log (rust-lang/cargo#13239)
- chore(deps): update compatible (rust-lang/cargo#13227)
- Contrib: Fix team HackMD links (rust-lang/cargo#13237)

r? ghost
@ehuss ehuss added this to the 1.77.0 milestone Mar 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants