Move `TyCtxt::mk_x` to `Ty::new_x` where applicable #113377

BoxyUwU · 2023-07-05T19:19:16Z

Part of rust-lang/compiler-team#616

turns out there's a lot of places we construct Ty this is a ridiculously huge PR :S

r? @oli-obk

rustbot · 2023-07-05T19:19:24Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to the core trait solver

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

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

compiler-errors · 2023-07-05T20:07:37Z

src/tools/miri/src/shims/os_str.rs

@@ -140,7 +141,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
        let size = u64::try_from(os_str.len()).unwrap().checked_add(1).unwrap(); // Make space for `0` terminator.
        let this = self.eval_context_mut();

-        let arg_type = this.tcx.mk_array(this.tcx.types.u8, size);
+        let arg_type = Ty::new_array(this.tcx.tcx,this.tcx.types.u8, size);


subtree formatting :(

compiler/rustc_middle/src/ty/context.rs

compiler-errors · 2023-07-05T20:59:17Z

@bors r+ p=10 (very bitrotty!!)

cc subtree owners (@rust-lang/miri, @rust-lang/clippy, and @antoyo for codegen_gcc), you all will need to run rustfmt on your own after this lands.

bors · 2023-07-05T20:59:19Z

📌 Commit 6ce1c89 has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2023-07-05T20:59:50Z

(oh and @bjorn3 too, you're a subtree owner too!)

compiler-errors · 2023-07-05T21:06:43Z

Noting as a retrospective, but not a blocker of this PR, that we have a lot of code even within the compiler/ directory which is unformatted and remains a bit ugly due to this PR (e.g. Ty::mk_unit(tcx,)).

This is not this PR's fault, but the fault of not having formatting for let-chains in-tree. I've chatted separately with @calebcartwright to understand how we can get provisional formatting into rust sooner than later now that we (T-style) have decided on a new nightly-features formatting policy 😉

compiler-errors · 2023-07-05T21:07:11Z

Additional nice-to-haves after this PR lands (just the ones that come to mind):

Replace usages of Ty::new_unit with tcx.types.unit (or vice versa) and similar with the other built-in scalar types for Consistency(TM).
Replace usages of ty::new_ref that have a fixed mutability with new_imm_ref or new_mut_ref to shorten it and avoid having to go through ty::TyAndMutability -- new_ref should imo only be used when the mutability is being passed in or is variable or something.
Ideally we'd fix some of the annoying formatting blips (like a lack of spacing after tcx, in the args) before getting full let-chains support...

bors · 2023-07-05T23:22:05Z

⌛ Testing commit 6ce1c89 with merge b3485f33f946f7556722b47529e79f82632fb229...

bors · 2023-07-06T00:00:32Z

💔 Test failed - checks-actions

oli-obk · 2023-07-06T07:32:36Z

@bors r=compiler-errors

bors · 2023-07-06T07:32:37Z

📌 Commit deda49e has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2023-07-06T08:10:46Z

⌛ Testing commit deda49e with merge 4dd1719...

bors · 2023-07-06T10:29:42Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 4dd1719 to master...

rust-timer · 2023-07-06T12:01:51Z

Finished benchmarking commit (4dd1719): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-0.7%	[-1.1%, -0.4%]	10
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.7%	[-1.1%, -0.4%]	10

Max RSS (memory usage)

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

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)	-	-	0
Improvements ✅ (primary)	-3.1%	[-4.3%, -1.4%]	8
Improvements ✅ (secondary)	-1.5%	[-1.5%, -1.5%]	1
All ❌✅ (primary)	-3.1%	[-4.3%, -1.4%]	8

Binary size

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

Bootstrap: 659.042s -> 656.237s (-0.43%)

…ler-errors Move `TyCtxt::mk_x` to `Ty::new_x` where applicable Part of rust-lang/compiler-team#616 turns out there's a lot of places we construct `Ty` this is a ridiculously huge PR :S r? `@oli-obk`

rustbot assigned oli-obk Jul 5, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jul 5, 2023

Move TyCtxt::mk_x to Ty::new_x where applicable

12138b8

BoxyUwU force-pushed the move_ty_ctors_to_ty branch from 18728d0 to 12138b8 Compare July 5, 2023 19:27

compiler-errors reviewed Jul 5, 2023

View reviewed changes

Change comment on TyCtxt::mk_ty_from_kind

6ce1c89

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 Jul 5, 2023

BoxyUwU assigned compiler-errors and unassigned oli-obk Jul 5, 2023

This comment has been minimized.

Sign in to view

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 Jul 6, 2023

Fix up doc links

deda49e

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 Jul 6, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 6, 2023

bors merged commit 4dd1719 into rust-lang:master Jul 6, 2023

rustbot added this to the 1.72.0 milestone Jul 6, 2023

lukas-code mentioned this pull request Jul 6, 2023

sanity check field offsets in unsizeable structs #113245

Merged

Move TyCtxt::mk_x to Ty::new_x where applicable #113377

Move TyCtxt::mk_x to Ty::new_x where applicable #113377

Uh oh!

Conversation

BoxyUwU commented Jul 5, 2023

Uh oh!

rustbot commented Jul 5, 2023

Uh oh!

Uh oh!

compiler-errors Jul 5, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

compiler-errors commented Jul 5, 2023

Uh oh!

bors commented Jul 5, 2023

Uh oh!

compiler-errors commented Jul 5, 2023

Uh oh!

compiler-errors commented Jul 5, 2023

Uh oh!

compiler-errors commented Jul 5, 2023

Uh oh!

bors commented Jul 5, 2023

Uh oh!

This comment has been minimized.

bors commented Jul 6, 2023

Uh oh!

oli-obk commented Jul 6, 2023

Uh oh!

bors commented Jul 6, 2023

Uh oh!

bors commented Jul 6, 2023

Uh oh!

bors commented Jul 6, 2023

Uh oh!

rust-timer commented Jul 6, 2023

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Move `TyCtxt::mk_x` to `Ty::new_x` where applicable #113377

Move `TyCtxt::mk_x` to `Ty::new_x` where applicable #113377