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

[beta-1.76.0] chore: tracing be compat with rustc_log #13242

Merged
merged 1 commit into from Jan 2, 2024

Conversation

weihanglo
Copy link
Member

Beta backports:

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

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? @ehuss

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

@rustbot
Copy link
Collaborator

rustbot commented Jan 2, 2024

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.76.0. Please double check that you specified the right target!

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

epage commented Jan 2, 2024

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 2, 2024

📌 Commit 431bc99 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 431bc99 with merge ddec308...

@bors
Copy link
Collaborator

bors commented Jan 2, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing ddec308 to rust-1.76.0...

1 similar comment
@bors
Copy link
Collaborator

bors commented Jan 2, 2024

☀️ Test successful - checks-actions
Approved by: epage
Pushing ddec308 to rust-1.76.0...

@bors bors merged commit ddec308 into rust-lang:rust-1.76.0 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.

@weihanglo weihanglo deleted the tracing-core-beta-backport branch January 2, 2024 23:58
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 6, 2024
…nglo

[beta-1.76] Update cargo

1 commits in 1a2666ddd14cf0a255d4ddb61c63531c259a7b39..ddec30889aff0c38118bcbeb59597d0bd85eddcd
2023-12-17 17:53:53 +0000 to 2024-01-02 23:23:28 +0000
- [beta-1.76.0] chore: tracing be compat with rustc_log (rust-lang/cargo#13242)

r? ghost
@rustbot rustbot added this to the 1.76.0 milestone Jan 8, 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