mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dont suggest use<APIT>

Browse Source
This commit is contained in:
Michael Goulet 2024-11-09 19:41:28 +00:00
parent ad20906065
commit a1f9d5bfba
6 changed files with 133 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
compiler/rustc_borrowck/src/diagnostics/opaque_suggestions.rs
View File

@ -4,15 +4,16 @@
use std::ops::ControlFlow; use std::ops::ControlFlow;
use either::Either; use either::Either;
use itertools::Itertools as _;
use rustc_data_structures::fx::FxIndexSet; use rustc_data_structures::fx::FxIndexSet;
use rustc_errors::{Applicability, Diag}; use rustc_errors::{Diag, Subdiagnostic};
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def_id::DefId; use rustc_hir::def_id::DefId;
use rustc_middle::mir::{self, ConstraintCategory, Location}; use rustc_middle::mir::{self, ConstraintCategory, Location};
use rustc_middle::ty::{ use rustc_middle::ty::{
self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor, self, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable, TypeVisitableExt, TypeVisitor,
}; };
use rustc_span::Symbol; use rustc_trait_selection::errors::impl_trait_overcapture_suggestion;
use crate::MirBorrowckCtxt; use crate::MirBorrowckCtxt;
use crate::borrow_set::BorrowData; use crate::borrow_set::BorrowData;
@ -61,6 +62,7 @@ pub(crate) fn note_due_to_edition_2024_opaque_capture_rules(
// *does* mention. We'll use that for the `+ use<'a>` suggestion below. // *does* mention. We'll use that for the `+ use<'a>` suggestion below.
let mut visitor = CheckExplicitRegionMentionAndCollectGenerics { let mut visitor = CheckExplicitRegionMentionAndCollectGenerics {
tcx, tcx,
generics: tcx.generics_of(opaque_def_id),
offending_region_idx, offending_region_idx,
seen_opaques: [opaque_def_id].into_iter().collect(), seen_opaques: [opaque_def_id].into_iter().collect(),
seen_lifetimes: Default::default(), seen_lifetimes: Default::default(),
@ -83,34 +85,50 @@ pub(crate) fn note_due_to_edition_2024_opaque_capture_rules(
"this call may capture more lifetimes than intended, \ "this call may capture more lifetimes than intended, \
because Rust 2024 has adjusted the `impl Trait` lifetime capture rules", because Rust 2024 has adjusted the `impl Trait` lifetime capture rules",
); );
let mut seen_generics: Vec<_> = let mut captured_args = visitor.seen_lifetimes;
visitor.seen_lifetimes.iter().map(ToString::to_string).collect(); // Add in all of the type and const params, too.
// Capture all in-scope ty/const params. // Ordering here is kinda strange b/c we're walking backwards,
seen_generics.extend( // but we're trying to provide *a* suggestion, not a nice one.
ty::GenericArgs::identity_for_item(tcx, opaque_def_id) let mut next_generics = Some(visitor.generics);
.iter() let mut any_synthetic = false;
.filter(|arg| { while let Some(generics) = next_generics {
matches!( for param in &generics.own_params {
arg.unpack(), if param.kind.is_ty_or_const() {
ty::GenericArgKind::Type(_) | ty::GenericArgKind::Const(_) captured_args.insert(param.def_id);
) }
}) if param.kind.is_synthetic() {
.map(|arg| arg.to_string()), any_synthetic = true;
); }
if opaque_def_id.is_local() { }
diag.span_suggestion_verbose( next_generics = generics.parent.map(|def_id| tcx.generics_of(def_id));
tcx.def_span(opaque_def_id).shrink_to_hi(), }
"add a precise capturing bound to avoid overcapturing",
format!(" + use<{}>", seen_generics.join(", ")), if let Some(opaque_def_id) = opaque_def_id.as_local()
Applicability::MaybeIncorrect, && let hir::OpaqueTyOrigin::FnReturn { parent, .. } =
); tcx.hir().expect_opaque_ty(opaque_def_id).origin
{
if let Some(sugg) = impl_trait_overcapture_suggestion(
tcx,
opaque_def_id,
parent,
captured_args,
) {
sugg.add_to_diag(diag);
}
} else { } else {
diag.span_help( diag.span_help(
tcx.def_span(opaque_def_id), tcx.def_span(opaque_def_id),
format!( format!(
"if you can modify this crate, add a precise \ "if you can modify this crate, add a precise \
capturing bound to avoid overcapturing: `+ use<{}>`", capturing bound to avoid overcapturing: `+ use<{}>`",
seen_generics.join(", ") if any_synthetic {
"/* Args */".to_string()
} else {
captured_args
.into_iter()
.map(|def_id| tcx.item_name(def_id))
.join(", ")
}
), ),
); );
} }
@ -182,9 +200,10 @@ fn visit_ty(&mut self, ty: Ty<'tcx>) -> Self::Result {
struct CheckExplicitRegionMentionAndCollectGenerics<'tcx> { struct CheckExplicitRegionMentionAndCollectGenerics<'tcx> {
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
generics: &'tcx ty::Generics,
offending_region_idx: usize, offending_region_idx: usize,
seen_opaques: FxIndexSet<DefId>, seen_opaques: FxIndexSet<DefId>,
seen_lifetimes: FxIndexSet<Symbol>, seen_lifetimes: FxIndexSet<DefId>,
} }
impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for CheckExplicitRegionMentionAndCollectGenerics<'tcx> { impl<'tcx> TypeVisitor<TyCtxt<'tcx>> for CheckExplicitRegionMentionAndCollectGenerics<'tcx> {
@ -214,7 +233,7 @@ fn visit_region(&mut self, r: ty::Region<'tcx>) -> Self::Result {
if param.index as usize == self.offending_region_idx { if param.index as usize == self.offending_region_idx {
ControlFlow::Break(()) ControlFlow::Break(())
} else { } else {
self.seen_lifetimes.insert(param.name); self.seen_lifetimes.insert(self.generics.region_param(param, self.tcx).def_id);
ControlFlow::Continue(()) ControlFlow::Continue(())
} }
} }

4
compiler/rustc_lint/src/impl_trait_overcaptures.rs
View File

@ -22,7 +22,9 @@
use rustc_session::{declare_lint, declare_lint_pass}; use rustc_session::{declare_lint, declare_lint_pass};
use rustc_span::edition::Edition; use rustc_span::edition::Edition;
use rustc_span::{Span, Symbol}; use rustc_span::{Span, Symbol};
use rustc_trait_selection::errors::{impl_trait_overcapture_suggestion, AddPreciseCapturingForOvercapture}; use rustc_trait_selection::errors::{
AddPreciseCapturingForOvercapture, impl_trait_overcapture_suggestion,
};
use rustc_trait_selection::traits::ObligationCtxt; use rustc_trait_selection::traits::ObligationCtxt;
use rustc_trait_selection::traits::outlives_bounds::InferCtxtExt; use rustc_trait_selection::traits::outlives_bounds::InferCtxtExt;

8
compiler/rustc_trait_selection/messages.ftl
View File

@ -280,10 +280,10 @@ trait_selection_outlives_content = lifetime of reference outlives lifetime of bo
trait_selection_precise_capturing_existing = add `{$new_lifetime}` to the `use<...>` bound to explicitly capture it trait_selection_precise_capturing_existing = add `{$new_lifetime}` to the `use<...>` bound to explicitly capture it
trait_selection_precise_capturing_new = add a `use<...>` bound to explicitly capture `{$new_lifetime}` trait_selection_precise_capturing_new = add a `use<...>` bound to explicitly capture `{$new_lifetime}`
trait_selection_precise_capturing_overcaptures = use the precise capturing `use<...>` syntax to make the captures explicit
trait_selection_precise_capturing_new_but_apit = add a `use<...>` bound to explicitly capture `{$new_lifetime}` after turning all argument-position `impl Trait` into type parameters, noting that this possibly affects the API of this crate trait_selection_precise_capturing_new_but_apit = add a `use<...>` bound to explicitly capture `{$new_lifetime}` after turning all argument-position `impl Trait` into type parameters, noting that this possibly affects the API of this crate
trait_selection_precise_capturing_overcaptures = use the precise capturing `use<...>` syntax to make the captures explicit
trait_selection_prlf_defined_with_sub = the lifetime `{$sub_symbol}` defined here... trait_selection_prlf_defined_with_sub = the lifetime `{$sub_symbol}` defined here...
trait_selection_prlf_defined_without_sub = the lifetime defined here... trait_selection_prlf_defined_without_sub = the lifetime defined here...
trait_selection_prlf_known_limitation = this is a known limitation that will be removed in the future (see issue #100013 <https://github.com/rust-lang/rust/issues/100013> for more information) trait_selection_prlf_known_limitation = this is a known limitation that will be removed in the future (see issue #100013 <https://github.com/rust-lang/rust/issues/100013> for more information)
@ -457,10 +457,10 @@ trait_selection_unable_to_construct_constant_value = unable to construct a const
trait_selection_unknown_format_parameter_for_on_unimplemented_attr = there is no parameter `{$argument_name}` on trait `{$trait_name}` trait_selection_unknown_format_parameter_for_on_unimplemented_attr = there is no parameter `{$argument_name}` on trait `{$trait_name}`
.help = expect either a generic argument name or {"`{Self}`"} as format argument .help = expect either a generic argument name or {"`{Self}`"} as format argument
trait_selection_warn_removing_apit_params_for_undercapture = you could use a `use<...>` bound to explicitly capture `{$new_lifetime}`, but argument-position `impl Trait`s are not nameable
trait_selection_warn_removing_apit_params_for_overcapture = you could use a `use<...>` bound to explicitly specify captures, but argument-position `impl Trait`s are not nameable trait_selection_warn_removing_apit_params_for_overcapture = you could use a `use<...>` bound to explicitly specify captures, but argument-position `impl Trait`s are not nameable
trait_selection_warn_removing_apit_params_for_undercapture = you could use a `use<...>` bound to explicitly capture `{$new_lifetime}`, but argument-position `impl Trait`s are not nameable
trait_selection_where_copy_predicates = copy the `where` clause predicates from the trait trait_selection_where_copy_predicates = copy the `where` clause predicates from the trait
trait_selection_where_remove = remove the `where` clause trait_selection_where_remove = remove the `where` clause

21
compiler/rustc_trait_selection/src/errors.rs
View File

@ -6,8 +6,8 @@
Applicability, Diag, DiagCtxtHandle, DiagMessage, DiagStyledString, Diagnostic, Applicability, Diag, DiagCtxtHandle, DiagMessage, DiagStyledString, Diagnostic,
EmissionGuarantee, IntoDiagArg, Level, MultiSpan, SubdiagMessageOp, Subdiagnostic, EmissionGuarantee, IntoDiagArg, Level, MultiSpan, SubdiagMessageOp, Subdiagnostic,
}; };
use rustc_hir::def::DefKind;
use rustc_hir as hir; use rustc_hir as hir;
use rustc_hir::def::DefKind;
use rustc_hir::def_id::{DefId, LocalDefId}; use rustc_hir::def_id::{DefId, LocalDefId};
use rustc_hir::intravisit::{Visitor, walk_ty}; use rustc_hir::intravisit::{Visitor, walk_ty};
use rustc_hir::{FnRetTy, GenericParamKind}; use rustc_hir::{FnRetTy, GenericParamKind};
@ -1793,10 +1793,17 @@ fn add_to_diag_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
self.suggs, self.suggs,
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
diag.span_note(self.apit_spans, fluent::trait_selection_warn_removing_apit_params_for_undercapture); diag.span_note(
self.apit_spans,
fluent::trait_selection_warn_removing_apit_params_for_undercapture,
);
} }
} }
/// Given a set of captured `DefId` for an RPIT (opaque_def_id) and a given
/// function (fn_def_id), try to suggest adding `+ use<...>` to capture just
/// the specified parameters. If one of those parameters is an APIT, then try
/// to suggest turning it into a regular type parameter.
pub fn impl_trait_overcapture_suggestion<'tcx>( pub fn impl_trait_overcapture_suggestion<'tcx>(
tcx: TyCtxt<'tcx>, tcx: TyCtxt<'tcx>,
opaque_def_id: LocalDefId, opaque_def_id: LocalDefId,
@ -1886,10 +1893,7 @@ pub fn impl_trait_overcapture_suggestion<'tcx>(
format!(" + use<{concatenated_bounds}>"), format!(" + use<{concatenated_bounds}>"),
)); ));
Some(AddPreciseCapturingForOvercapture { Some(AddPreciseCapturingForOvercapture { suggs, apit_spans })
suggs,
apit_spans,
})
} }
pub struct AddPreciseCapturingForOvercapture { pub struct AddPreciseCapturingForOvercapture {
@ -1909,7 +1913,10 @@ fn add_to_diag_with<G: EmissionGuarantee, F: SubdiagMessageOp<G>>(
Applicability::MaybeIncorrect, Applicability::MaybeIncorrect,
); );
if !self.apit_spans.is_empty() { if !self.apit_spans.is_empty() {
diag.span_note(self.apit_spans, fluent::trait_selection_warn_removing_apit_params_for_overcapture); diag.span_note(
self.apit_spans,
fluent::trait_selection_warn_removing_apit_params_for_overcapture,
);
} }
} }
} }

15
tests/ui/impl-trait/precise-capturing/migration-note.rs
View File

@ -187,4 +187,19 @@ fn returned() -> impl Sized {
} }
//~^ NOTE `x` dropped here while still borrowed //~^ NOTE `x` dropped here while still borrowed
fn capture_apit(x: &impl Sized) -> impl Sized {}
//~^ NOTE you could use a `use<...>` bound to explicitly specify captures, but
fn test_apit() {
let x = String::new();
//~^ NOTE binding `x` declared here
let y = capture_apit(&x);
//~^ NOTE borrow of `x` occurs here
//~| NOTE this call may capture more lifetimes than intended
drop(x);
//~^ ERROR cannot move out of `x` because it is borrowed
//~| NOTE move out of `x` occurs here
}
//~^ NOTE borrow might be used here, when `y` is dropped
fn main() {} fn main() {}

58
tests/ui/impl-trait/precise-capturing/migration-note.stderr
View File

@ -30,7 +30,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len(&x); LL | let a = display_len(&x);
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> { LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -55,7 +55,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len(&x); LL | let a = display_len(&x);
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> { LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -80,7 +80,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len(&x); LL | let a = display_len(&x);
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> { LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -106,7 +106,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len_mut(&mut x); LL | let a = display_len_mut(&mut x);
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> { LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -131,7 +131,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len_mut(&mut x); LL | let a = display_len_mut(&mut x);
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> { LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -156,7 +156,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_len_mut(&mut x); LL | let a = display_len_mut(&mut x);
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> { LL | fn display_len_mut<T>(x: &mut Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -182,7 +182,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_field(&s.f); LL | let a = display_field(&s.f);
| ^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> { LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -204,7 +204,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_field(&mut s.f); LL | let a = display_field(&mut s.f);
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> { LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -226,7 +226,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | let a = display_field(&mut s.f); LL | let a = display_field(&mut s.f);
| ^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> { LL | fn display_field<T: Copy + Display>(t: &T) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -252,7 +252,7 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
| |
LL | x = display_len(&z.f); LL | x = display_len(&z.f);
| ^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> { LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
@ -273,12 +273,46 @@ note: this call may capture more lifetimes than intended, because Rust 2024 has
LL | let x = { let x = display_len(&mut vec![0]); x }; LL | let x = { let x = display_len(&mut vec![0]); x };
| ^^^^^^^^^^^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^^^^^^^^^^^^
= note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info) = note: this error originates in the macro `vec` (in Nightly builds, run with -Z macro-backtrace for more info)
help: add a precise capturing bound to avoid overcapturing help: use the precise capturing `use<...>` syntax to make the captures explicit
| |
LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> { LL | fn display_len<T>(x: &Vec<T>) -> impl Display + use<T> {
| ++++++++ | ++++++++
error: aborting due to 12 previous errors error[E0505]: cannot move out of `x` because it is borrowed
--> $DIR/migration-note.rs:199:10
|
LL | let x = String::new();
| - binding `x` declared here
LL |
LL | let y = capture_apit(&x);
| -- borrow of `x` occurs here
...
LL | drop(x);
| ^ move out of `x` occurs here
...
LL | }
| - borrow might be used here, when `y` is dropped and runs the destructor for type `impl Sized`
|
note: this call may capture more lifetimes than intended, because Rust 2024 has adjusted the `impl Trait` lifetime capture rules
--> $DIR/migration-note.rs:196:13
|
LL | let y = capture_apit(&x);
| ^^^^^^^^^^^^^^^^
note: you could use a `use<...>` bound to explicitly specify captures, but argument-position `impl Trait`s are not nameable
--> $DIR/migration-note.rs:190:21
|
LL | fn capture_apit(x: &impl Sized) -> impl Sized {}
| ^^^^^^^^^^
help: use the precise capturing `use<...>` syntax to make the captures explicit
|
LL | fn capture_apit<T: Sized>(x: &T) -> impl Sized + use<T> {}
| ++++++++++ ~ ++++++++
help: consider cloning the value if the performance cost is acceptable
|
LL | let y = capture_apit(&x.clone());
| ++++++++
error: aborting due to 13 previous errors
Some errors have detailed explanations: E0499, E0502, E0503, E0505, E0506, E0597, E0716. Some errors have detailed explanations: E0499, E0502, E0503, E0505, E0506, E0597, E0716.
For more information about an error, try `rustc --explain E0499`. For more information about an error, try `rustc --explain E0499`.