diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-09 01:22:03 +0200 |
|---|---|---|
| committer | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-09-09 16:44:23 +0200 |
| commit | e2640a51eee383dcc337e78c233597d18dc78fa2 (patch) | |
| tree | 48088832ad7f9555f1f7cc4eb11fcad1ba587062 | |
| parent | 50a0ec91e066237acd8cc416cd1c0457c8240b96 (diff) | |
| download | rust-e2640a51eee383dcc337e78c233597d18dc78fa2.tar.gz rust-e2640a51eee383dcc337e78c233597d18dc78fa2.zip | |
typeck: use .peel_refs() more.
| -rw-r--r-- | src/librustc_typeck/check/op.rs | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs index 93855a3b68a..18b555dc037 100644 --- a/src/librustc_typeck/check/op.rs +++ b/src/librustc_typeck/check/op.rs @@ -268,7 +268,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { op.node.as_str(), lhs_ty), ); let mut suggested_deref = false; - if let Ref(_, mut rty, _) = lhs_ty.sty { + if let Ref(_, rty, _) = lhs_ty.sty { if { self.infcx.type_is_copy_modulo_regions(self.param_env, rty, @@ -279,13 +279,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { .is_ok() } { if let Ok(lstring) = source_map.span_to_snippet(lhs_expr.span) { - while let Ref(_, rty_inner, _) = rty.sty { - rty = rty_inner; - } let msg = &format!( "`{}=` can be used on '{}', you can dereference `{}`", op.node.as_str(), - rty, + rty.peel_refs(), lstring, ); err.span_suggestion( @@ -361,7 +358,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { } let mut suggested_deref = false; - if let Ref(_, mut rty, _) = lhs_ty.sty { + if let Ref(_, rty, _) = lhs_ty.sty { if { self.infcx.type_is_copy_modulo_regions(self.param_env, rty, @@ -372,17 +369,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> { .is_ok() } { if let Ok(lstring) = source_map.span_to_snippet(lhs_expr.span) { - while let Ref(_, rty_inner, _) = rty.sty { - rty = rty_inner; - } - let msg = &format!( - "`{}` can be used on '{}', you can \ - dereference `{2}`: `*{2}`", - op.node.as_str(), - rty, - lstring - ); - err.help(msg); + err.help(&format!( + "`{}` can be used on '{}', you can \ + dereference `{2}`: `*{2}`", + op.node.as_str(), + rty.peel_refs(), + lstring + )); suggested_deref = true; } } |