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

Rollup of 6 pull requests #102867

Merged
merged 18 commits into from
Oct 10, 2022
Merged

Rollup of 6 pull requests #102867

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
887515a
Trying to suggest additional lifetime parameter
Stoozy Sep 26, 2022
365457b
Using multipart suggestion
Stoozy Sep 27, 2022
24c8e27
Properly formatting the multipart suggestion
Stoozy Sep 27, 2022
e7cb6ad
Proper span for new generic param suggestion
Stoozy Sep 28, 2022
ef930a2
Emitting error regardless of new param suggestion
Stoozy Sep 29, 2022
2657f9d
Removed unnecessary for loop
Stoozy Oct 1, 2022
7b2f04a
fix #102182, recover from impl Trait in type param bound
chenyukang Sep 27, 2022
c084c26
Split slice part of feature(half_open_range_patterns) to [...]_in_slices
Urgau Oct 5, 2022
5ae7363
Stabilize half_open_range_patterns
Urgau Sep 24, 2022
f5fd66e
Elaborate trait ref to compute object safety.
cjgillot Oct 9, 2022
550f579
Add missing documentation for FileNameDisplayPreference variants
GuillaumeGomez Oct 9, 2022
0718aec
From<Alignment> for usize & NonZeroUsize
scottmcm Oct 9, 2022
c50e64d
Rollup merge of #102275 - Urgau:stabilize-half_open_range_patterns, r…
JohnTitor Oct 10, 2022
0db05f1
Rollup merge of #102323 - Stoozy:master, r=cjgillot
JohnTitor Oct 10, 2022
303ebd5
Rollup merge of #102345 - chenyukang:fix-102182-impl-trait, r=estebank
JohnTitor Oct 10, 2022
a4e5577
Rollup merge of #102845 - cjgillot:gat-object, r=fee1-dead
JohnTitor Oct 10, 2022
e435a05
Rollup merge of #102860 - GuillaumeGomez:missing-docs-FileNameDisplay…
JohnTitor Oct 10, 2022
6d35efe
Rollup merge of #102862 - scottmcm:more-alignment-traits, r=thomcc
JohnTitor Oct 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Using multipart suggestion
  • Loading branch information
@Stoozy
Stoozy committed Sep 27, 2022
commit 365457bd2590029e0cdba5b401273169c0fa6a79
31 changes: 19 additions & 12 deletions compiler/rustc_resolve/src/late/lifetimes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

use rustc_ast::walk_list;
use rustc_data_structures::fx::{FxHashSet, FxIndexMap, FxIndexSet};
use rustc_errors::{struct_span_err};
use rustc_errors::struct_span_err;
use rustc_hir as hir;
use rustc_hir::def::{DefKind, Res};
use rustc_hir::def_id::LocalDefId;
Expand All @@ -24,7 +24,6 @@ use rustc_span::symbol::{sym, Ident};
use rustc_span::Span;
use std::fmt;


trait RegionExt {
fn early(hir_map: Map<'_>, param: &GenericParam<'_>) -> (LocalDefId, Region);

Expand Down Expand Up @@ -1320,21 +1319,29 @@ impl<'a, 'tcx> LifetimeContext<'a, 'tcx> {
&& !self.tcx.features().anonymous_lifetime_in_impl_trait
{

match self.tcx.hir().get_generics(lifetime_ref.hir_id.owner.to_def_id().as_local().unwrap()) {
match self.tcx.hir().get_generics(lifetime_ref.hir_id.owner.def_id) {
Some(generics) => {
for i in 0..generics.params.len() {

if !generics.span.contains(generics.params[i].span) {
struct_span_err!(
self.tcx.sess,

let mut diag = rustc_session::parse::feature_err(
&self.tcx.sess.parse_sess,
sym::anonymous_lifetime_in_impl_trait,
lifetime_ref.span,
E0106,
"missing lifetime specifier"
)
.span_label(lifetime_ref.span, "expected named lifetime parameter")
.span_help(generics.span, "consider introducing a named lifetime parameter")
.emit();
return;
"anonymous lifetimes in `impl Trait` are unstable",
);

diag.span_label(lifetime_ref.span, "expected named lifetime parameter");

diag.multipart_suggestion("consider introducing a named lifetime parameter",
vec![
(lifetime_ref.span, "&'a ".to_owned()),
(generics.span, "<'a>".to_owned())
], rustc_errors::Applicability::MaybeIncorrect);
diag.emit();

return;
}
}
},
Expand Down