Skip to content

Remove #[macro_use] extern crate tracing from rustdoc and rustfmt - #129774

Merged
bors merged 3 commits into
rust-lang:masterfrom
nnethercote:rm-extern-crate-tracing-remainder
Aug 31, 2024
Merged

Remove #[macro_use] extern crate tracing from rustdoc and rustfmt#129774
bors merged 3 commits into
rust-lang:masterfrom
nnethercote:rm-extern-crate-tracing-remainder

Conversation

@nnethercote

@nnethercotennethercote commented Aug 30, 2024

Copy link
Copy Markdown
Contributor

A follow-up to #129767 and earlier PRs doing this for rustc_* crates.

r? @GuillaumeGomez

@rustbot

rustbot commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@rustbotrustbot added A-rustdoc-json Area: Rustdoc JSON backend S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Aug 30, 2024
@nnethercote

nnethercote commented Aug 30, 2024

Copy link
Copy Markdown
ContributorAuthor

I think all these changes should be valid. Hopefully there is no rustdoc/rustfmt weirdness that I'm overlooking.

Once this PR + #129767 + #129768 merge, the only extern crate tracing cases left are those in src/tools/miri/src/lib.rs and src/tools/miri/src/bin/miri.rs, both of which are marked as Some "regular" crates we want to share with rustc.

@GuillaumeGomez

GuillaumeGomez commented Aug 30, 2024

Copy link
Copy Markdown
Member

Thanks!

@bors r+ rollup

@bors

bors commented Aug 30, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit ee5ec5a has been approved by GuillaumeGomez

It is now in the queue for this repository.

@borsbors 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 30, 2024
@ytmimi

ytmimi commented Aug 30, 2024

Copy link
Copy Markdown
Contributor

@nnethercote I think it would have been better to make this change with a PR to rustfmt repo.

workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Aug 31, 2024
@workingjubilee
Rollup merge ofrust-lang#129774- nnethercote:rm-extern-crate-tracin…
cff2cc2
…g-remainder, r=GuillaumeGomez
Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt
A follow-up to rust-lang#129767 and earlier PRs doing this for `rustc_*` crates.
r? `@GuillaumeGomez`
@workingjubileeworkingjubilee mentioned this pull request Aug 31, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129802- workingjubilee:rollup-kjgatqm, r=wor…
d186e16
…kingjubilee
Rollup of 16 pull requests
Successful merges:
- rust-lang#129123 (rustdoc-json: Add test for `Self` type)
- rust-lang#129675 (allow BufReader::peek to be called on unsized types)
- rust-lang#129678 (Deny imports of `rustc_type_ir::inherent` outside of type ir + new trait solver)
- rust-lang#129723 (Simplify some extern providers)
- rust-lang#129724 (Remove `Option<!>` return types.)
- rust-lang#129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries)
- rust-lang#129730 (f32 docs: define 'arithmetic' operations)
- rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes)
- rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection)
- rust-lang#129760 (Make the "detect-old-time" UI test more representative)
- rust-lang#129762 (Update the `wasm-component-ld` binary dependency)
- rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4)
- rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt)
- rust-lang#129780 (add crashtests for several old unfixed ICEs)
- rust-lang#129782 (couple more crash tests)
- rust-lang#129791 (mark joboet as on vacation)
r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 31, 2024
@matthiaskrgr
Rollup merge ofrust-lang#129774- nnethercote:rm-extern-crate-tracin…
c50a1fa
…g-remainder, r=GuillaumeGomez
Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt
A follow-up to rust-lang#129767 and earlier PRs doing this for `rustc_*` crates.
r? ``@GuillaumeGomez``
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 31, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129810- matthiaskrgr:rollup-ftlptye, r=matth…
98c77d7
…iaskrgr
Rollup of 11 pull requests
Successful merges:
- rust-lang#129630 (Document the broken C ABI of `wasm32-unknown-unknown`)
- rust-lang#129711 (Expand NLL MIR dumps)
- rust-lang#129730 (f32 docs: define 'arithmetic' operations)
- rust-lang#129733 (Subtree update of `rust-analyzer`)
- rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes)
- rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection)
- rust-lang#129760 (Make the "detect-old-time" UI test more representative)
- rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4)
- rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt)
- rust-lang#129785 (Miri subtree update)
- rust-lang#129791 (mark joboet as on vacation)
Failed merges:
- rust-lang#129777 (Add `unreachable_pub`, round 4)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 31, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129817- matthiaskrgr:rollup-ll2ld5m, r=matth…
3f329d5
…iaskrgr
Rollup of 12 pull requests
Successful merges:
- rust-lang#129659 (const fn stability checking: also check declared language features)
- rust-lang#129711 (Expand NLL MIR dumps)
- rust-lang#129730 (f32 docs: define 'arithmetic' operations)
- rust-lang#129733 (Subtree update of `rust-analyzer`)
- rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes)
- rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection)
- rust-lang#129760 (Make the "detect-old-time" UI test more representative)
- rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4)
- rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt)
- rust-lang#129785 (Miri subtree update)
- rust-lang#129791 (mark joboet as on vacation)
- rust-lang#129812 (interpret, codegen: tweak some comments and checks regarding Box with custom allocator)
Failed merges:
- rust-lang#129777 (Add `unreachable_pub`, round 4)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@bors
Auto merge ofrust-lang#129817- matthiaskrgr:rollup-ll2ld5m, r=matth…
d571ae8
…iaskrgr
Rollup of 12 pull requests
Successful merges:
- rust-lang#129659 (const fn stability checking: also check declared language features)
- rust-lang#129711 (Expand NLL MIR dumps)
- rust-lang#129730 (f32 docs: define 'arithmetic' operations)
- rust-lang#129733 (Subtree update of `rust-analyzer`)
- rust-lang#129749 (llvm-wrapper: adapt for LLVM API changes)
- rust-lang#129757 (Add a test for trait solver overflow in MIR inliner cycle detection)
- rust-lang#129760 (Make the "detect-old-time" UI test more representative)
- rust-lang#129767 (Remove `#[macro_use] extern crate tracing`, round 4)
- rust-lang#129774 (Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt)
- rust-lang#129785 (Miri subtree update)
- rust-lang#129791 (mark joboet as on vacation)
- rust-lang#129812 (interpret, codegen: tweak some comments and checks regarding Box with custom allocator)
Failed merges:
- rust-lang#129777 (Add `unreachable_pub`, round 4)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 893d073 into rust-lang:masterAug 31, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 31, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2024
@rust-timer
Unrolled build forrust-lang#129774
d3569ae
Rollup merge of rust-lang#129774 - nnethercote:rm-extern-crate-tracing-remainder, r=GuillaumeGomez
Remove `#[macro_use] extern crate tracing` from rustdoc and rustfmt
A follow-up to rust-lang#129767 and earlier PRs doing this for `rustc_*` crates.
r? ```@GuillaumeGomez```
@nnethercote
nnethercote deleted the rm-extern-crate-tracing-remainder branch September 1, 2024 22:27
@ytmimiytmimi mentioned this pull request Sep 12, 2024
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GuillaumeGomezGuillaumeGomezGuillaumeGomez approved these changes

Assignees

@GuillaumeGomezGuillaumeGomez

Labels

A-rustdoc-jsonArea: Rustdoc JSON backendS-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant to the rustdoc team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

5 participants

@nnethercote@rustbot@GuillaumeGomez@bors@ytmimi