Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrating rustc_infer to session diagnostics (part 5) #108698

Merged
merged 16 commits into from
Apr 10, 2023
Merged

Migrating rustc_infer to session diagnostics (part 5) #108698

merged 16 commits into from
Apr 10, 2023

Conversation

IntQuant
Copy link
Contributor

@IntQuant IntQuant commented Mar 3, 2023

@rustbot label +A-translation
cc #100717

@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2023

r? @wesleywiser

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic 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. labels Mar 3, 2023
@IntQuant
Copy link
Contributor Author

IntQuant commented Mar 3, 2023

r? rust-lang/diagnostics

@rustbot rustbot assigned davidtwco and unassigned wesleywiser Mar 3, 2023
@IntQuant IntQuant force-pushed the issue-100717-infer-6 branch from d1e7ac4 to b06f707 Compare March 3, 2023 13:30
@bors

This comment was marked as resolved.

Sign in to view
@IntQuant IntQuant force-pushed the issue-100717-infer-6 branch from 8b3268a to 26b7873 Compare March 4, 2023 11:10
@IntQuant IntQuant marked this pull request as ready for review March 4, 2023 15:10
davidtwco
davidtwco requested changes Mar 9, 2023
View reviewed changes
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/errors/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/mod.rs Outdated Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/mod.rs Show resolved Hide resolved
compiler/rustc_infer/src/infer/error_reporting/suggest.rs Outdated Show resolved Hide resolved
@IntQuant IntQuant force-pushed the issue-100717-infer-6 branch from 14a2411 to d96f540 Compare March 11, 2023 14:40
@bors
Copy link
Contributor

bors commented Mar 12, 2023

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

@IntQuant IntQuant force-pushed the issue-100717-infer-6 branch from d96f540 to 39478c9 Compare March 12, 2023 09:21
IntQuant and others added 14 commits April 4, 2023 18:34
@IntQuant
Ported FunctionPointerSuggestion
37f5569
@IntQuant
Migrate SuggestAsRefWhereAppropriate
b36abea
@IntQuant
Migrate SuggestAccessingField
d56b304
@IntQuant
Migrate SuggestBoxingForReturnImplTrait, Fix typo in infer_fn_conside…
23b8567 
…r_casting
@IntQuant
Migrate SuggestTuplePattern
d18adb7
@IntQuant
Migrate TupleTrailingCommaSuggestion
b610ce7
@IntQuant
FailureCode::Error0038 is unreachable, so can be removed
ab11b43
@IntQuant
Migrate (most of) report_and_explain_type_error
1f09bc7
@IntQuant @davidtwco
Update compiler/rustc_infer/src/infer/error_reporting/suggest.rs
e813b6d 
Co-authored-by: David Wood <[email protected]>
@IntQuant
Move and document escape_literal function
aa33a6f
@IntQuant
Renamed TypeErrorAdditionalDiags (was Error0308Subdiags) and Obligati…
fd18d9a 
…onCauseFailureCode (was FailureCodeDiagnostics)
@IntQuant
A more general implementation of IntoDiagnosticArg for Binder (Al…
6a05cd8 
…so removes `DiagArg`, as it's no longer necessary)
@IntQuant
Extract suggest_specify_actual_length into a separate function
21d5bed
@IntQuant
Rename tuple_wrap_err_subdiag to suggest_wrap_to_build_a_tuple, makin…
467d367 
…g it more consistent with similar functions
@IntQuant IntQuant force-pushed the issue-100717-infer-6 branch from 39478c9 to 467d367 Compare April 4, 2023 15:50
@rust-log-analyzer

This comment has been minimized.

Sign in to view
davidtwco
davidtwco approved these changes Apr 10, 2023
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the delay in getting back to this, one last comment then r=me.

compiler/rustc_middle/src/ty/sty.rs Outdated Show resolved Hide resolved
@davidtwco
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Apr 10, 2023

📌 Commit d07b1cd has been approved by davidtwco

It is now in the queue for this repository.

@bors 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 Apr 10, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 10, 2023
@Dylan-DPC
Rollup merge of rust-lang#108698 - IntQuant:issue-100717-infer-6, r=d…
f2c7257 
…avidtwco

Migrating rustc_infer to session diagnostics (part 5)

`@rustbot` label +A-translation
cc rust-lang#100717
@Dylan-DPC Dylan-DPC mentioned this pull request Apr 10, 2023
Closed
@bors
Copy link
Contributor

bors commented Apr 10, 2023

⌛ Testing commit d07b1cd with merge 88fb1b9...

@bors
Copy link
Contributor

bors commented Apr 10, 2023

☀️ Test successful - checks-actions
Approved by: davidtwco
Pushing 88fb1b9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2023
@bors bors merged commit 88fb1b9 into rust-lang:master Apr 10, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 10, 2023
@bors bors mentioned this pull request Apr 10, 2023
Closed
6 tasks
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (88fb1b9): 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.3% [-0.3%, -0.3%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.3% [-0.3%, -0.3%] 1

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.8% [0.6%, 0.9%] 3
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)		 -5.0% [-6.6%, -3.4%] 2
All ❌✅ (primary) 0.4% [-0.5%, 0.9%] 4

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.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)		 4.1% [3.2%, 4.9%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.4% [0.4%, 0.4%] 1

@IntQuant IntQuant mentioned this pull request Apr 29, 2023
Open
84 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
7 participants
@IntQuant @rustbot @bors @rust-log-analyzer @davidtwco @rust-timer @wesleywiser