diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs | 19 | ||||
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/mod.rs | 12 |
2 files changed, 28 insertions, 3 deletions
diff --git a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs index 55c434078db..272fb6c608c 100644 --- a/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs +++ b/compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs @@ -655,8 +655,9 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { fn ty_kind_suggestion(&self, ty: Ty<'tcx>) -> Option<String> { // Keep in sync with `rustc_hir_analysis/src/check/mod.rs:ty_kind_suggestion`. // FIXME: deduplicate the above. + let tcx = self.infcx.tcx; let implements_default = |ty| { - let Some(default_trait) = self.infcx.tcx.get_diagnostic_item(sym::Default) else { + let Some(default_trait) = tcx.get_diagnostic_item(sym::Default) else { return false; }; self.infcx @@ -671,9 +672,21 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { ty::Int(_) | ty::Uint(_) => "42".into(), ty::Float(_) => "3.14159".into(), ty::Slice(_) => "[]".to_string(), - ty::Adt(def, _) if Some(def.did()) == self.infcx.tcx.get_diagnostic_item(sym::Vec) => { + ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::Vec) => { "vec![]".to_string() } + ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::String) => { + "String::new()".to_string() + } + ty::Adt(def, args) if def.is_box() => { + format!("Box::new({})", self.ty_kind_suggestion(args[0].expect_ty())?) + } + ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::Option) => { + "None".to_string() + } + ty::Adt(def, args) if Some(def.did()) == tcx.get_diagnostic_item(sym::Result) => { + format!("Ok({})", self.ty_kind_suggestion(args[0].expect_ty())?) + } ty::Adt(_, _) if implements_default(ty) => "Default::default()".to_string(), ty::Ref(_, ty, mutability) => { if let (ty::Str, hir::Mutability::Not) = (ty.kind(), mutability) { @@ -688,7 +701,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> { ty::Array(ty, len) => format!( "[{}; {}]", self.ty_kind_suggestion(*ty)?, - len.eval_target_usize(self.infcx.tcx, ty::ParamEnv::reveal_all()), + len.eval_target_usize(tcx, ty::ParamEnv::reveal_all()), ), ty::Tuple(tys) => format!( "({})", diff --git a/compiler/rustc_hir_analysis/src/check/mod.rs b/compiler/rustc_hir_analysis/src/check/mod.rs index 11217c2796c..938c0a19e33 100644 --- a/compiler/rustc_hir_analysis/src/check/mod.rs +++ b/compiler/rustc_hir_analysis/src/check/mod.rs @@ -490,6 +490,18 @@ pub fn ty_kind_suggestion<'tcx>(ty: Ty<'tcx>, tcx: TyCtxt<'tcx>) -> Option<Strin ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::Vec) => { "vec![]".to_string() } + ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::String) => { + "String::new()".to_string() + } + ty::Adt(def, args) if def.is_box() => { + format!("Box::new({})", ty_kind_suggestion(args[0].expect_ty(), tcx)?) + } + ty::Adt(def, _) if Some(def.did()) == tcx.get_diagnostic_item(sym::Option) => { + "None".to_string() + } + ty::Adt(def, args) if Some(def.did()) == tcx.get_diagnostic_item(sym::Result) => { + format!("Ok({})", ty_kind_suggestion(args[0].expect_ty(), tcx)?) + } ty::Adt(_, _) if implements_default(ty) => "Default::default()".to_string(), ty::Ref(_, ty, mutability) => { if let (ty::Str, Mutability::Not) = (ty.kind(), mutability) { |