Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` #122852

compiler-errors · 2024-03-21T23:31:20Z

Pretty much mechanically converting ty::RawPtr(ty::TypeAndMut { ty, mutbl }) to ty::RawPtr(ty, mutbl) and its fallout.

r? lcnr

cc rust-lang/types-team#124

rustbot · 2024-03-21T23:31:30Z

Some changes occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes occurred in compiler/rustc_symbol_mangling/src/typeid

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

Type relation code was changed

cc @compiler-errors, @lcnr

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

lcnr · 2024-03-22T09:22:31Z

compiler/rustc_hir_analysis/src/coherence/builtin.rs

-        (&ty::RawPtr(mt_a), &ty::RawPtr(mt_b)) => {
-            check_mutbl(mt_a, mt_b, &|ty| Ty::new_imm_ptr(tcx, ty))
-        }
+        (&ty::Ref(_, ty_a, mutbl_a), &ty::RawPtr(ty_b, mutbl_b)) => check_mutbl(


are these the only remaining uses of TypeAndMut?

This could just be check_mutbl(mutbl_a, mutbl_b) and then use target and source for the error messagte instead.

lcnr · 2024-03-22T09:23:20Z

compiler/rustc_hir_analysis/src/variance/constraints.rs

-            ty::RawPtr(ref mt) => {
-                self.add_constraints_from_mt(current, mt, variance);
+            ty::RawPtr(ty, mutbl) => {
+                self.add_constraints_from_mt(current, &ty::TypeAndMut { ty, mutbl }, variance);


okay... not the only use of TypeAndMut 🤷 idk if it's useful to fully remove it then

Is there an issue tracking "entirely remove TypeAndMut"? That would be the logical next step IMO.

I am not totally sure, some of the remaining uses here seem appropriate as an abstraction over both Ref and RawPtr. Personally don't care too much about keeping it around 🤷

lcnr · 2024-03-22T09:25:05Z

compiler/rustc_hir_typeck/src/coercion.rs

@@ -984,13 +978,13 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {

        let (is_ref, mt_a) = match *a.kind() {
            ty::Ref(_, ty, mutbl) => (true, ty::TypeAndMut { ty, mutbl }),
-            ty::RawPtr(mt) => (false, mt),
+            ty::RawPtr(ty, mutbl) => (false, ty::TypeAndMut { ty, mutbl }),


this canreturn (is_ref, ty_a, mutbl_a) instead

lcnr · 2024-03-22T09:30:42Z

compiler/rustc_middle/src/ty/sty.rs

+        r: Region<'tcx>,
+        ty: Ty<'tcx>,
+        mutbl: ty::Mutability,


vibe: would have expected r, mutbl, ty to match the &'r mutbl ty syntax, same for new_ptr. Anyways, fine to merge as is

lcnr · 2024-03-22T09:35:58Z

@bors r+ rollup=never

bors · 2024-03-22T09:36:01Z

📌 Commit 4f90688 has been approved by lcnr

It is now in the queue for this repository.

bors · 2024-03-22T13:19:24Z

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

rustbot · 2024-03-22T15:17:25Z

HIR ty lowering was modified

cc @fmease

compiler-errors · 2024-03-22T15:24:55Z

@bors r=lcnr

bors · 2024-03-22T15:26:09Z

📌 Commit 6a40dab has been approved by lcnr

It is now in the queue for this repository.

bors · 2024-03-22T20:34:18Z

⌛ Testing commit 6a40dab with merge 85e449a...

bors · 2024-03-22T22:34:06Z

☀️ Test successful - checks-actions
Approved by: lcnr
Pushing 85e449a to master...

rust-timer · 2024-03-22T23:58:07Z

Finished benchmarking commit (85e449a): 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)

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)	-	-	0
Improvements ✅ (secondary)	-6.0%	[-7.0%, -5.5%]	3
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 669.004s -> 669.446s (0.07%)
Artifact size: 314.95 MiB -> 314.98 MiB (0.01%)

Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` Pretty much mechanically converting `ty::RawPtr(ty::TypeAndMut { ty, mutbl })` to `ty::RawPtr(ty, mutbl)` and its fallout. r? lcnr cc rust-lang/types-team#124

rustbot assigned lcnr Mar 21, 2024

This comment has been minimized.

Sign in to view

compiler-errors force-pushed the raw-ptr branch from 9df16cc to 4f90688 Compare March 21, 2024 23:43

lcnr reviewed Mar 22, 2024

View reviewed changes

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 Mar 22, 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 Mar 22, 2024

compiler-errors added 6 commits March 22, 2024 11:12

Remove TypeAndMut from relate

24db8ea

Eagerly convert some ctors to use their specialized ctors

81e7e80

Ty::new_ref and Ty::new_ptr stop using TypeAndMut

f0f224a

Programmatically convert some of the pat ctors

ff0c31e

Make RawPtr take Ty and Mutbl separately

7be0dbe

And the tools too

6a40dab

compiler-errors force-pushed the raw-ptr branch from 4f90688 to 6a40dab Compare March 22, 2024 15:17

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 Mar 22, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 22, 2024

bors merged commit 85e449a into rust-lang:master Mar 22, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Mar 22, 2024

This was referenced Mar 22, 2024

Report a specialized error when a 'static obligation comes from an impl dyn Trait #121274

Open

Add a special case for CStr/CString in the improper_ctypes lint #120176

Closed

Move alignment checks to codegen #117473

Draft

maurer mentioned this pull request Mar 22, 2024

CFI: Support self_cell-like recursion #122875

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` #122852

Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` #122852

compiler-errors commented Mar 21, 2024

rustbot commented Mar 21, 2024

This comment has been minimized.

lcnr Mar 22, 2024

lcnr Mar 22, 2024

RalfJung Mar 22, 2024

lcnr Mar 22, 2024

lcnr Mar 22, 2024

lcnr Mar 22, 2024

lcnr commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

rustbot commented Mar 22, 2024

compiler-errors commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

rust-timer commented Mar 22, 2024

Remove TypeAndMut from ty::RawPtr variant, make it take Ty and Mutability #122852

Remove TypeAndMut from ty::RawPtr variant, make it take Ty and Mutability #122852

Conversation

compiler-errors commented Mar 21, 2024

rustbot commented Mar 21, 2024

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lcnr commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

rustbot commented Mar 22, 2024

compiler-errors commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

bors commented Mar 22, 2024

rust-timer commented Mar 22, 2024

Overall result: no relevant changes - no action needed

Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` #122852

Remove `TypeAndMut` from `ty::RawPtr` variant, make it take `Ty` and `Mutability` #122852