nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update lint message

Browse Source
This commit is contained in:
Aman Arora 2021-04-01 16:49:05 -04:00
parent e78fac5601
commit 18af989c06
1 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
compiler/rustc_typeck/src/check/upvar.rs
View File

@ -479,7 +479,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
); );
if !need_migrations.is_empty() { if !need_migrations.is_empty() {
let migrations_text = migration_suggestion_for_2229(self.tcx, &need_migrations); let (migration_string, migrated_variables_concat) =
migration_suggestion_for_2229(self.tcx, &need_migrations);
let local_def_id = closure_def_id.expect_local(); let local_def_id = closure_def_id.expect_local();
let closure_hir_id = self.tcx.hir().local_def_id_to_hir_id(local_def_id); let closure_hir_id = self.tcx.hir().local_def_id_to_hir_id(local_def_id);
@ -495,15 +496,20 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let (sugg, app) = let (sugg, app) =
match self.tcx.sess.source_map().span_to_snippet(closure_body_span) { match self.tcx.sess.source_map().span_to_snippet(closure_body_span) {
Ok(s) => ( Ok(s) => (
format!("{{ {} {} }}", migrations_text, s), format!("{{ {}; {} }}", migration_string, s),
Applicability::MachineApplicable, Applicability::MachineApplicable,
), ),
Err(_) => (migrations_text.clone(), Applicability::HasPlaceholders), Err(_) => (migration_string.clone(), Applicability::HasPlaceholders),
}; };
let diagnostic_msg = format!(
"`{}` causes {} to be fully captured",
migration_string, migrated_variables_concat
);
diagnostics_builder.span_suggestion( diagnostics_builder.span_suggestion(
closure_body_span, closure_body_span,
&format!("You can restore original behavior adding `{}` to the closure/generator", migrations_text), &diagnostic_msg,
sugg, sugg,
app, app,
); );
@ -1537,16 +1543,29 @@ fn should_do_migration_analysis(tcx: TyCtxt<'_>, closure_id: hir::HirId) -> bool
!matches!(level, lint::Level::Allow) !matches!(level, lint::Level::Allow)
} }
fn migration_suggestion_for_2229(tcx: TyCtxt<'_>, need_migrations: &Vec<hir::HirId>) -> String { /// Return a two string tuple (s1, s2)
let need_migrations_strings = /// - s1: Line of code that is needed for the migration: eg: `let _ = (&x, ...)`.
need_migrations.iter().map(|v| format!("&{}", var_name(tcx, *v))).collect::<Vec<_>>(); /// - s2: Comma separated names of the variables being migrated.
let migrations_list_concat = need_migrations_strings.join(", "); fn migration_suggestion_for_2229(
tcx: TyCtxt<'_>,
need_migrations: &Vec<hir::HirId>,
) -> (String, String) {
let need_migrations_variables =
need_migrations.iter().map(|v| var_name(tcx, *v)).collect::<Vec<_>>();
if 1 == need_migrations.len() { let migration_ref_concat =
format!("let _ = {};", migrations_list_concat) need_migrations_variables.iter().map(|v| format!("&{}", v)).collect::<Vec<_>>().join(", ");
let migration_string = if 1 == need_migrations.len() {
format!("let _ = {}", migration_ref_concat)
} else { } else {
format!("let _ = ({});", migrations_list_concat) format!("let _ = ({})", migration_ref_concat)
} };
let migrated_variables_concat =
need_migrations_variables.iter().map(|v| format!("`{}`", v)).collect::<Vec<_>>().join(", ");
(migration_string, migrated_variables_concat)
} }
/// Helper function to determine if we need to escalate CaptureKind from /// Helper function to determine if we need to escalate CaptureKind from