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

Correct detection of elided lifetimes in impl-trait. #106501

Merged
merged 1 commit into from
Jan 6, 2023
Merged

Correct detection of elided lifetimes in impl-trait. #106501

merged 1 commit into from
Jan 6, 2023

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jan 5, 2023

@rustbot 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. labels Jan 5, 2023
@compiler-errors compiler-errors added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 5, 2023
@compiler-errors
Copy link
Member

Makes sense.

@bors r+

@bors
Copy link
Contributor

bors commented Jan 5, 2023

📌 Commit de1859f has been approved by compiler-errors

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 Jan 5, 2023
pnkfelix
pnkfelix reviewed Jan 5, 2023
View reviewed changes
compiler/rustc_hir_analysis/src/collect/lifetimes.rs
&& let hir::LifetimeName::Param(param_id) = lifetime_ref.res
&& let Some(generics) = self.tcx.hir().get_generics(self.tcx.local_parent(param_id))
&& let Some(param) = generics.params.iter().find(|p| p.def_id == param_id)
&& param.is_elided_lifetime()
Copy link
Member

Choose a reason for hiding this comment

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

With this PR, the error message still reads as ""anonymous lifetimes in impl Trait are unstable"

should it change to "elided lifetimes" instead of "anonymous lifetimes"?

Copy link
Member

Choose a reason for hiding this comment

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

(this feedback need not block the landing of this PR. It was just something I noticed while looking it over)

@compiler-errors compiler-errors mentioned this pull request Jan 5, 2023
Closed
@bors
Copy link
Contributor

bors commented Jan 6, 2023

⌛ Testing commit de1859f with merge 0fb8b72...

@bors
Copy link
Contributor

bors commented Jan 6, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 6, 2023
@bors bors merged commit 0fb8b72 into rust-lang:master Jan 6, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 6, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (0fb8b72): comparison URL.

Overall result: ❌ regressions - 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)		 1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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
Regressions ❌
(secondary)		 4.6% [4.6%, 4.6%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

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)		 1.3% [1.1%, 1.6%] 3
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 1.3% [1.1%, 1.6%] 3

@cjgillot cjgillot deleted the resolved-elided-apit branch January 7, 2023 16:10
@apiraino
Copy link
Contributor

Beta backport approved as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 12, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.68.0, 1.67.0 Jan 19, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 19, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jan 19, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2023
@bors
Auto merge of rust-lang#107071 - Mark-Simulacrum:beta-next, r=Mark-Si…
b7a6d74 
…mulacrum

[beta] backport rollup

* Revert "Make nested RPITIT inherit the parent opaque's generics." rust-lang#106759
*  Fix mpsc::SyncSender spinning behavior rust-lang#106701
*  rustdoc: fix outdated lint section of the book rust-lang#106605
*  Do not filter substs in remap_generic_params_to_declaration_params. rust-lang#106503
*  Correct detection of elided lifetimes in impl-trait. rust-lang#106501
*  Bump rust-installer rust-lang#106196
*  Don't panic on stable since miri is not available there rust-lang#105901
@c410-f3r c410-f3r mentioned this pull request Jan 27, 2023
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pnkfelix pnkfelix pnkfelix left review comments

Assignees

@compiler-errors compiler-errors

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. 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.67.0
Development

Successfully merging this pull request may close these issues.

regression: anonymous lifetimes now unstable in impl trait
8 participants
@cjgillot @compiler-errors @bors @rust-timer @apiraino @pnkfelix @Mark-Simulacrum @rustbot