Skip to content

Introduce ReError - #107652

Merged
bors merged 6 commits into
rust-lang:masterfrom
estebank:re_error
Feb 10, 2023
Merged

Introduce ReError#107652
bors merged 6 commits into
rust-lang:masterfrom
estebank:re_error

Conversation

@estebank

@estebankestebank commented Feb 3, 2023

Copy link
Copy Markdown
Contributor

@rustbotrustbot 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. labels Feb 3, 2023
estebank
estebank commented Feb 3, 2023
View reviewed changes
Comment threadtests/ui/lifetimes/issue-69314.stderr Outdated
Comment on lines 12 to 21

@estebankestebankFeb 3, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

We want to hide this error

@estebankestebankFeb 6, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I've looked at this and it seems that Self::f2 doesn't seem to get around to influencing the lifetime requirements from Self::g, let's follow up on this in a subsequent PR.

estebank
estebank commented Feb 3, 2023
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/universal_regions.rs Outdated
@compiler-errors

compiler-errors commented Feb 3, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

cc @rust-lang/types who might have opinions about this approach.

I think making ReError should require delaying a bug or providing a ErrorGuaranteed like the error ty kind, and it should store it in the variant (ErrorGuaranteed is a zst iirc, so it shouldn't have any overhead). Then we can just ignore it during type relations, instead of delaying a bug there.

oli-obk
oli-obk requested changes Feb 4, 2023
View reviewed changes
Comment threadcompiler/rustc_hir_analysis/src/collect/type_of.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs Outdated
@estebankestebank mentioned this pull request Feb 6, 2023
Closed
@estebank
estebankforce-pushed the re_error branch 3 times, most recently from ef4d70f to 349156eCompareFebruary 7, 2023 16:20
oli-obk
oli-obk requested changes Feb 8, 2023
View reviewed changes

@oli-obkoli-obk left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we may want to make FlagComputation::add_region also set the error flag for error regions, but that may cause additional diagnostics changes, so maybe do it in a follow up PR

Comment threadcompiler/rustc_hir_analysis/src/astconv/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs Outdated
Comment threadcompiler/rustc_infer/src/infer/lexical_region_resolve/mod.rs Outdated
Comment on lines 1043 to 1047

@oli-obkoli-obkFeb 8, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we may want to carry an ErrorGuaranteed through ErrorValue in the future, doesn't have to be this PR tho

@estebankestebankFeb 9, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I started doing this and realized that where we construct the ErrorValue we don't have easy access to ErrorGuaranteed, so I'll leave this as follow up work, as suggested.

Comment threadcompiler/rustc_middle/src/ty/context.rs Outdated
Comment threadcompiler/rustc_middle/src/ty/opaque_types.rs Outdated
@oli-obk

oli-obk commented Feb 8, 2023

Copy link
Copy Markdown
Contributor

r? @oli-obk

@rustbotrustbot assigned oli-obk and unassigned nagisaFeb 8, 2023
@oli-obk

oli-obk commented Feb 9, 2023

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Feb 9, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit 3689295 has been approved by oli-obk

It is now in the queue for this repository.

@borsbors 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 Feb 9, 2023
@bors

bors commented Feb 10, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 3689295 with merge d1ac43a...

@bors

bors commented Feb 10, 2023

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing d1ac43a to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Feb 10, 2023
@bors
bors merged commit d1ac43a into rust-lang:masterFeb 10, 2023
@rustbotrustbot added this to the 1.69.0 milestone Feb 10, 2023
@borsbors mentioned this pull request Feb 10, 2023
Closed
@rust-timer

rust-timer commented Feb 10, 2023

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (d1ac43a): 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.

meanrangecount
Regressions ❌
(primary)		4.3%[4.3%, 4.3%]1
Regressions ❌
(secondary)		3.1%[2.4%, 3.8%]12
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)4.3%[4.3%, 4.3%]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.

meanrangecount
Regressions ❌
(primary)		3.1%[3.1%, 3.1%]1
Regressions ❌
(secondary)		--0
Improvements ✅
(primary)		--0
Improvements ✅
(secondary)		--0
All ❌✅ (primary)3.1%[3.1%, 3.1%]1

@estebank
estebank deleted the re_error branch November 9, 2023 05:11
@matthiaskrgrmatthiaskrgr mentioned this pull request Apr 20, 2024
Closed
@matthiaskrgrmatthiaskrgr mentioned this pull request May 6, 2024
Open
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk requested changes

Assignees

@oli-obkoli-obk

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.69.0

Development

Successfully merging this pull request may close these issues.

7 participants

@estebank@compiler-errors@oli-obk@bors@rust-timer@nagisa@rustbot