Fix inference issues with unconstrained base expr in `type_changing_struct_update` #97705

compiler-errors · 2022-06-03T19:56:15Z

Use fresh infer vars to guide inference along in type_changing_struct_update.

Fixes #96878

rust-highfive · 2022-06-03T19:56:18Z

r? @michaelwoerister

(rust-highfive has picked a reviewer for you, use r? to override)

michaelwoerister · 2022-06-07T09:56:51Z

r? rust-lang/compiler (do we have an alias for the types team?)

@nikomatsakis

inspired by rust-lang/rust#97705 (comment) > (do we have an alias for the types team?) cc @rust-lang/types -- I only added the members of t-types who are already on the reviewer rotation, specifically excluding @nikomatsakis and @spastorino since they aren't currently on the rotation. also add myself to diagnostics since i am a member of that wg, and move @cjgillot to the compiler team from the compiler team contributors grouping.

estebank · 2022-06-10T18:26:13Z

r? @lcnr

I'm r=me, but adding someone on the types team.

lcnr

lgtm r=me

there's one optional improvement i found, if you're interested in implementing that

lcnr · 2022-06-10T18:49:53Z

compiler/rustc_typeck/src/check/expr.rs

+                            self.tcx.mk_adt(*adt, fresh_substs),
+                            |_| {},
+                        );
+                        let base_ty = self.shallow_resolve(base_ty);
                        match base_ty.kind() {
                            ty::Adt(base_adt, base_subs) if adt == base_adt => {


can you now bug! if that isn#t the case? or at least delay_span_bug if it's ty::Error? would safe us 8 columns of indentation ^^

ironically, I don't think check_expr_has_type_or_error actually returns ty::Error when the expected type != the checked type of the input expr, hence us (still) needing to call report_mismatched_types on line before:1605/after:1624. I can easily check, though.

I will see if I can simplify this, though. It can at least be changed to a let-chain :)

lcnr

also, while you're in that file, can you change https://github.com/rust-lang/rust/blob/ac33d2b3e1359930a02653f0c61a124947912ed8/compiler/rustc_typeck/src/check/expr.rs#L1538 to not do a string comparison 😆

compiler-errors · 2022-06-11T17:41:50Z

I was able to turn the redundant report_mismatched_types into a span_bug! and I removed the string comparison with "union".

@bors r=lcnr

compiler-errors · 2022-06-11T17:59:44Z

wake up bors

@bors r=lcnr

bors · 2022-06-11T17:59:45Z

📌 Commit 5052911 has been approved by lcnr

bors · 2022-06-11T22:32:22Z

⌛ Testing commit 5052911 with merge e652caa...

bors · 2022-06-12T00:47:48Z

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

rust-timer · 2022-06-12T02:08:42Z

Finished benchmarking commit (e652caa): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: 🎉 relevant improvement found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	-3.4%	-3.4%	1
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	-3.4%	-3.4%	1

Cycles

Results

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: 😿 relevant regressions found

	mean¹	max	count²
Regressions 😿 (primary)	3.4%	5.8%	8
Regressions 😿 (secondary)	3.1%	4.4%	3
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	3.4%	5.8%	8

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? `@nikomatsakis` cc `@rust-lang/types`

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? ``@nikomatsakis`` cc ``@rust-lang/types``

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? ```@nikomatsakis``` cc ```@rust-lang/types```

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? ````@nikomatsakis```` cc ````@rust-lang/types````

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? `````@nikomatsakis````` cc `````@rust-lang/types`````

…_update_is_probably_complete, r=oli-obk Make `type_changing_struct_update` no longer an incomplete feature After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter. r? ``````@nikomatsakis`````` cc ``````@rust-lang/types``````

rust-highfive assigned michaelwoerister Jun 3, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 3, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 3, 2022

rust-highfive assigned estebank and unassigned michaelwoerister Jun 7, 2022

compiler-errors mentioned this pull request Jun 7, 2022

Set up rust-lang/types highfive alias rust-lang/highfive#405

Merged

rust-highfive assigned lcnr and unassigned estebank Jun 10, 2022

lcnr reviewed Jun 10, 2022

View reviewed changes

Guide inference along during type_changing_struct_update

6c00e54

compiler-errors force-pushed the guide-inference branch from ac33d2b to b524ba4 Compare June 11, 2022 16:57

compiler-errors added 2 commits June 11, 2022 10:24

Use if-let instead of match with guard

d9ddaf0

Stop using string equality to check if ADT is a union

5052911

compiler-errors force-pushed the guide-inference branch from f4ec06e to 5052911 Compare June 11, 2022 17:35

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 Jun 11, 2022

This was referenced Jun 11, 2022

Make type_changing_struct_update no longer an incomplete feature #97999

Merged

[NO MERGE] Enable type_changing_struct_update always (crater run) #98000

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 12, 2022

bors merged commit e652caa into rust-lang:master Jun 12, 2022

rustbot added this to the 1.63.0 milestone Jun 12, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix inference issues with unconstrained base expr in `type_changing_struct_update` #97705

Fix inference issues with unconstrained base expr in `type_changing_struct_update` #97705

compiler-errors commented Jun 3, 2022

rust-highfive commented Jun 3, 2022

michaelwoerister commented Jun 7, 2022

estebank commented Jun 10, 2022

lcnr left a comment

lcnr Jun 10, 2022

compiler-errors Jun 10, 2022 •

edited

Loading

lcnr left a comment

compiler-errors commented Jun 11, 2022

compiler-errors commented Jun 11, 2022

bors commented Jun 11, 2022

bors commented Jun 11, 2022

bors commented Jun 12, 2022

rust-timer commented Jun 12, 2022

Fix inference issues with unconstrained base expr in type_changing_struct_update #97705

Fix inference issues with unconstrained base expr in type_changing_struct_update #97705

Conversation

compiler-errors commented Jun 3, 2022

rust-highfive commented Jun 3, 2022

michaelwoerister commented Jun 7, 2022

estebank commented Jun 10, 2022

lcnr left a comment

Choose a reason for hiding this comment

lcnr Jun 10, 2022

Choose a reason for hiding this comment

compiler-errors Jun 10, 2022 • edited Loading

Choose a reason for hiding this comment

lcnr left a comment

Choose a reason for hiding this comment

compiler-errors commented Jun 11, 2022

compiler-errors commented Jun 11, 2022

bors commented Jun 11, 2022

bors commented Jun 11, 2022

bors commented Jun 12, 2022

rust-timer commented Jun 12, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Fix inference issues with unconstrained base expr in `type_changing_struct_update` #97705

Fix inference issues with unconstrained base expr in `type_changing_struct_update` #97705

compiler-errors Jun 10, 2022 •

edited

Loading