Remove `#[macro_use] extern crate rustc middle` from numerous crates #124914

nnethercote · 2024-05-08T23:05:37Z

Because explicit importing of macros via use items is nicer (more standard and readable) than implicit importing via #[macro_use]. This PR mops up some cases I didn't get to in #124511.

r? @saethlin

rustbot · 2024-05-08T23:05:46Z

Some changes occurred in rustc_ty_utils::consts.rs

cc @BoxyUwU

HIR ty lowering was modified

cc @fmease

Some changes occurred in match lowering

cc @Nadrieril

changes to the core type system

cc @compiler-errors, @lcnr

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred in coverage instrumentation.

cc @Zalathar

Some changes occurred in const_evaluatable.rs

cc @BoxyUwU

changes to the core type system

cc @compiler-errors, @lcnr

RalfJung · 2024-05-09T07:50:43Z

compiler/rustc_const_eval/src/const_eval/error.rs

@@ -7,6 +7,7 @@ use rustc_middle::mir::AssertKind;
 use rustc_middle::query::TyCtxtAt;
 use rustc_middle::ty::TyCtxt;
 use rustc_middle::ty::{layout::LayoutError, ConstInt};
+use rustc_middle::{err_inval, err_machine_stop};


These are interpreter macros. If we use them from a path, then ideally we use them from the interpret module, i.e as part of the use crate::interpret::... below (based on crate::interpret doing a re-export of rustc_middle::interpret).

Does that work, or is it really needed to get these from the crate root?

I have added another commit that adds a pub use foo for each of these macros, and then they can be imported with use crate::interpret::foo. I think that's the best way to achieve that.

Ah, is pub use how one gets an item for a macro_rules in the current module? Nice, TIL.

bors · 2024-05-09T22:16:09Z

☔ The latest upstream changes (presumably #124934) made this pull request unmergeable. Please resolve the merge conflicts.

saethlin · 2024-05-09T23:58:20Z

I've considered submitting PRs like this, but the sheer number of lines changed has always turned me off. I like having this change, glad I didn't have to do it.

r=me when you fix the conflicts

nnethercote · 2024-05-10T00:56:03Z

The only ones remaining are for extern crate tracing. If you want to remove some/all of those, it's tedious but easy :)

I rebased.

@bors r=saethlin

bors · 2024-05-10T00:56:06Z

📌 Commit ad0f595 has been approved by saethlin

It is now in the queue for this repository.

…middle, r=saethlin Remove `#[macro_use] extern crate rustc middle` from numerous crates Because explicit importing of macros via `use` items is nicer (more standard and readable) than implicit importing via `#[macro_use]`. This PR mops up some cases I didn't get to in rust-lang#124511. r? `@saethlin`

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#124551 (Add benchmarks for `impl Debug for str`) - rust-lang#124914 (Remove `#[macro_use] extern crate rustc middle` from numerous crates) - rust-lang#124915 (`rustc_target` cleanups) - rust-lang#124918 (Eliminate some `FIXME(lcnr)` comments) - rust-lang#124927 (opt-dist: use xz2 instead of xz crate) - rust-lang#124936 (analyse visitor: build proof tree in probe) - rust-lang#124943 (always use `GenericArgsRef`) Failed merges: - rust-lang#124955 (Use fewer origins when creating type variables.) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-05-10T05:29:28Z

needs rebase already :/
@bors r-

matthiaskrgr · 2024-05-10T05:31:35Z

or the problem is that we can't merge this together with other stuff due to conflicts showing up then..
@bors rollup=never

nnethercote · 2024-05-10T05:36:31Z

@bors r=saethlin

bors · 2024-05-10T05:36:33Z

📌 Commit ad0f595 has been approved by saethlin

It is now in the queue for this repository.

bors · 2024-05-10T08:58:01Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rm-extern-crate-rustc_middle (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rm-extern-crate-rustc_middle --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_ty_utils/src/representability.rs
Auto-merging compiler/rustc_ty_utils/src/implied_bounds.rs
Auto-merging compiler/rustc_ty_utils/src/assoc.rs
Auto-merging compiler/rustc_trait_selection/src/traits/vtable.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/mod.rs
Auto-merging compiler/rustc_trait_selection/src/traits/select/confirmation.rs
Auto-merging compiler/rustc_trait_selection/src/traits/project.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/type_err_ctxt_ext.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
Auto-merging compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
Auto-merging compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs
Auto-merging compiler/rustc_trait_selection/src/solve/eval_ctxt/canonical.rs
Auto-merging compiler/rustc_metadata/src/rmeta/encoder.rs
Auto-merging compiler/rustc_infer/src/infer/relate/generalize.rs
Auto-merging compiler/rustc_infer/src/infer/mod.rs
Auto-merging compiler/rustc_infer/src/infer/error_reporting/need_type_info.rs
Auto-merging compiler/rustc_infer/src/infer/error_reporting/mod.rs
Auto-merging compiler/rustc_hir_typeck/src/place_op.rs
Auto-merging compiler/rustc_hir_typeck/src/pat.rs
Auto-merging compiler/rustc_hir_typeck/src/op.rs
Auto-merging compiler/rustc_hir_typeck/src/method/suggest.rs
CONFLICT (content): Merge conflict in compiler/rustc_hir_typeck/src/method/suggest.rs
Auto-merging compiler/rustc_hir_typeck/src/method/probe.rs
Auto-merging compiler/rustc_hir_typeck/src/method/prelude2021.rs
CONFLICT (content): Merge conflict in compiler/rustc_hir_typeck/src/method/prelude2021.rs
Auto-merging compiler/rustc_hir_typeck/src/method/mod.rs
Auto-merging compiler/rustc_hir_typeck/src/method/confirm.rs
Auto-merging compiler/rustc_hir_typeck/src/lib.rs
Auto-merging compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
Auto-merging compiler/rustc_hir_typeck/src/expr.rs
Auto-merging compiler/rustc_hir_typeck/src/demand.rs
Auto-merging compiler/rustc_hir_typeck/src/coercion.rs
Auto-merging compiler/rustc_hir_typeck/src/closure.rs
Auto-merging compiler/rustc_hir_typeck/src/callee.rs
Auto-merging compiler/rustc_hir_analysis/src/variance/mod.rs
Auto-merging compiler/rustc_hir_analysis/src/lib.rs
Auto-merging compiler/rustc_hir_analysis/src/hir_ty_lowering/object_safety.rs
Auto-merging compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
Auto-merging compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs
Auto-merging compiler/rustc_hir_analysis/src/collect/type_of.rs
Auto-merging compiler/rustc_hir_analysis/src/collect/resolve_bound_vars.rs
Auto-merging compiler/rustc_hir_analysis/src/collect/predicates_of.rs
Auto-merging compiler/rustc_hir_analysis/src/coherence/orphan.rs
Auto-merging compiler/rustc_hir_analysis/src/check/wfcheck.rs
Auto-merging compiler/rustc_hir_analysis/src/check/compare_impl_item.rs
Auto-merging compiler/rustc_hir_analysis/src/check/check.rs
Automatic merge failed; fix conflicts and then commit the result.

This requires exporting the interpreter macros so they can be used with `use crate::interpret::*`.

nnethercote · 2024-05-12T22:33:16Z

I rebased again.

@bors r=saethlin p=1

Priority bump because this is conflict-prone.

bors · 2024-05-12T22:33:18Z

📌 Commit c34ebba has been approved by saethlin

It is now in the queue for this repository.

bors · 2024-05-13T00:13:38Z

⌛ Testing commit c34ebba with merge ba956ef...

bors · 2024-05-13T02:19:33Z

☀️ Test successful - checks-actions
Approved by: saethlin
Pushing ba956ef to master...

rust-timer · 2024-05-13T04:40:24Z

Finished benchmarking commit (ba956ef): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-4.8%	[-4.8%, -4.8%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-4.8%	[-4.8%, -4.8%]	1

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	5.7%	[5.7%, 5.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.1%	[-2.1%, -2.1%]	1
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 676.356s -> 677.304s (0.14%)
Artifact size: 316.06 MiB -> 316.15 MiB (0.03%)

…r=jackh726 Remove more `#[macro_use] extern crate tracing` Because explicit importing of macros via use items is nicer (more standard and readable) than implicit importing via `#[macro_use]`. Continuing the work from rust-lang#124511 and rust-lang#124914. r? `@jackh726`

avoid using macro_use This is the Miri version of rust-lang/rust#124914

rustbot assigned saethlin May 8, 2024

nnethercote force-pushed the rm-extern-crate-rustc_middle branch from 62e59b4 to 8d18170 Compare May 9, 2024 00:53

RalfJung reviewed May 9, 2024

View reviewed changes

nnethercote force-pushed the rm-extern-crate-rustc_middle branch from 8d18170 to d740618 Compare May 9, 2024 10:13

nnethercote force-pushed the rm-extern-crate-rustc_middle branch from d740618 to ad0f595 Compare May 10, 2024 00:54

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 May 10, 2024

matthiaskrgr mentioned this pull request May 10, 2024

Rollup of 7 pull requests #124960

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 10, 2024

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 10, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 10, 2024

nnethercote added 10 commits May 13, 2024 08:02

Remove extern crate rustc_middle from rustc_const_eval.

4497d34

This requires exporting the interpreter macros so they can be used with `use crate::interpret::*`.

Remove extern crate rustc_middle from rustc_hir_analysis.

f59348f

Remove extern crate rustc_middle from rustc_hir_typeck.

9b7d254

Remove extern crate rustc_middle from rustc_infer.

34e247a

Remove extern crate rustc_middle from rustc_metadata.

00cfb45

Remove extern crate rustc_middle from rustc_mir_build.

900bcac

Remove extern crate rustc_middle from rustc_mir_transform.

d49d4ae

Remove extern crate rustc_middle from rustc_query_impl.

573aa9f

Remove extern crate rustc_middle from rustc_trait_selection.

4bf20b2

Remove extern crate rustc_middle from rustc_ty_utils.

c34ebba

nnethercote force-pushed the rm-extern-crate-rustc_middle branch from ad0f595 to c34ebba Compare May 12, 2024 22:32

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 12, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label May 13, 2024

bors merged commit ba956ef into rust-lang:master May 13, 2024
7 checks passed

rustbot added this to the 1.80.0 milestone May 13, 2024

fmease mentioned this pull request May 13, 2024

Use a proper probe for shadowing impl #124844

Merged

nnethercote mentioned this pull request May 23, 2024

Remove more #[macro_use] extern crate tracing #125434

Merged

RalfJung mentioned this pull request May 26, 2024

avoid using macro_use rust-lang/miri#3634

Merged

bors added a commit to rust-lang/miri that referenced this pull request May 26, 2024

Auto merge of #3634 - RalfJung:macro_use, r=RalfJung

7cbaf0e

avoid using macro_use This is the Miri version of rust-lang/rust#124914

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `#[macro_use] extern crate rustc middle` from numerous crates #124914

Remove `#[macro_use] extern crate rustc middle` from numerous crates #124914

nnethercote commented May 8, 2024

rustbot commented May 8, 2024

RalfJung May 9, 2024 •

edited

nnethercote May 9, 2024

RalfJung May 9, 2024 •

edited

bors commented May 9, 2024

saethlin commented May 9, 2024

nnethercote commented May 10, 2024

bors commented May 10, 2024

matthiaskrgr commented May 10, 2024

matthiaskrgr commented May 10, 2024

nnethercote commented May 10, 2024

bors commented May 10, 2024

bors commented May 10, 2024

nnethercote commented May 12, 2024

bors commented May 12, 2024

bors commented May 13, 2024

bors commented May 13, 2024

rust-timer commented May 13, 2024

Remove #[macro_use] extern crate rustc middle from numerous crates #124914

Remove #[macro_use] extern crate rustc middle from numerous crates #124914

Conversation

nnethercote commented May 8, 2024

rustbot commented May 8, 2024

RalfJung May 9, 2024 • edited

Choose a reason for hiding this comment

nnethercote May 9, 2024

Choose a reason for hiding this comment

RalfJung May 9, 2024 • edited

Choose a reason for hiding this comment

bors commented May 9, 2024

saethlin commented May 9, 2024

nnethercote commented May 10, 2024

bors commented May 10, 2024

matthiaskrgr commented May 10, 2024

matthiaskrgr commented May 10, 2024

nnethercote commented May 10, 2024

bors commented May 10, 2024

bors commented May 10, 2024

nnethercote commented May 12, 2024

bors commented May 12, 2024

bors commented May 13, 2024

bors commented May 13, 2024

rust-timer commented May 13, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Remove `#[macro_use] extern crate rustc middle` from numerous crates #124914

Remove `#[macro_use] extern crate rustc middle` from numerous crates #124914

RalfJung May 9, 2024 •

edited

RalfJung May 9, 2024 •

edited