Commit fafc3d2

committed

Handle exclusive refs in suggestion to copy/clone

1 parent 683b265 commit fafc3d2Copy full SHA for fafc3d2

File tree

+61

-3

lines changed

+61

-3

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1110,7 +1110,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1110`	`1110`	`{`
`1111`	`1111`	`let expr_inner_ty = args.type_at(0);`
`1112`	`1112`	`let expected_inner_ty = expected_args.type_at(0);`
`1113`		`- if let &ty::Ref(_, ty, hir::Mutability::Not) = expr_inner_ty.kind()`
	`1113`	`+ if let &ty::Ref(_, ty, mutability) = expr_inner_ty.kind()`
`1114`	`1114`	`&& self.can_eq(self.param_env, ty, expected_inner_ty)`
`1115`	`1115`	`{`
`1116`	`1116`	`let def_path = self.tcx.def_path_str(adt_def.did());`
`@@ -1119,7 +1119,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`1119`	`1119`	`errors::OptionResultRefMismatch::Copied {`
`1120`	`1120`	`span, def_path`
`1121`	`1121`	`}`
`1122`		`- } else if let Some(expected_ty_expr) = expected_ty_expr {`
	`1122`	`+ } else if let Some(expected_ty_expr) = expected_ty_expr`
	`1123`	`+ // FIXME: suggest changes to both expressions to convert both to`
	`1124`	`+ // Option/Result<&T>`
	`1125`	`+ && mutability.is_not()`
	`1126`	`+ {`
`1123`	`1127`	`errors::OptionResultRefMismatch::AsRef {`
`1124`	`1128`	`span: expected_ty_expr.span.shrink_to_hi(), expected_ty, expr_ty, def_path`
`1125`	`1129`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,18 @@ fn main() {`
`28`	`28`	`//~^ ERROR mismatched types`
`29`	`29`	//~\| HELP use `Option::as_ref` to convert `Option<String>` to `Option<&String>`
`30`	`30`
	`31`	`+`
	`32`	`+ let mut s = ();`
	`33`	`+ let x = Some(s);`
	`34`	`+ let y = Some(&mut s);`
	`35`	`+ println!("{}", x == y.copied());`
	`36`	`+ //~^ ERROR mismatched types`
	`37`	+ //~\| HELP use `Option::copied` to copy the value inside the `Option`
	`38`	`+`
	`39`	`+ let mut s = String::new();`
	`40`	`+ let x = Some(s.clone());`
	`41`	`+ let y = Some(&mut s);`
	`42`	`+ println!("{}", x == y.cloned());`
	`43`	`+ //~^ ERROR mismatched types`
	`44`	+ //~\| HELP use `Option::cloned` to clone the value inside the `Option`
`31`	`45`	`}`

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,18 @@ fn main() {`
`28`	`28`	`//~^ ERROR mismatched types`
`29`	`29`	//~\| HELP use `Option::as_ref` to convert `Option<String>` to `Option<&String>`
`30`	`30`
	`31`	`+`
	`32`	`+ let mut s = ();`
	`33`	`+ let x = Some(s);`
	`34`	`+ let y = Some(&mut s);`
	`35`	`+ println!("{}", x == y);`
	`36`	`+ //~^ ERROR mismatched types`
	`37`	+ //~\| HELP use `Option::copied` to copy the value inside the `Option`
	`38`	`+`
	`39`	`+ let mut s = String::new();`
	`40`	`+ let x = Some(s.clone());`
	`41`	`+ let y = Some(&mut s);`
	`42`	`+ println!("{}", x == y);`
	`43`	`+ //~^ ERROR mismatched types`
	`44`	+ //~\| HELP use `Option::cloned` to clone the value inside the `Option`
`31`	`45`	`}`

Lines changed: 27 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -91,6 +91,32 @@ help: use `Option::as_ref` to convert `Option<String>` to `Option<&String>`
`91`	`91`	`LL \| println!("{}", x.as_ref() == y);`
`92`	`92`	`\| +++++++++`
`93`	`93`
`94`		`-error: aborting due to 5 previous errors`
	`94`	`+error[E0308]: mismatched types`
	`95`	`+ --> $DIR/copied-and-cloned.rs:35:25`
	`96`	`+ \|`
	`97`	`+LL \| println!("{}", x == y);`
	`98`	+ \| ^ expected `Option<()>`, found `Option<&mut ()>`
	`99`	`+ \|`
	`100`	+ = note: expected enum `Option<()>`
	`101`	+ found enum `Option<&mut ()>`
	`102`	+help: use `Option::copied` to copy the value inside the `Option`
	`103`	`+ \|`
	`104`	`+LL \| println!("{}", x == y.copied());`
	`105`	`+ \| +++++++++`
	`106`	`+`
	`107`	`+error[E0308]: mismatched types`
	`108`	`+ --> $DIR/copied-and-cloned.rs:42:25`
	`109`	`+ \|`
	`110`	`+LL \| println!("{}", x == y);`
	`111`	+ \| ^ expected `Option<String>`, found `Option<&mut String>`
	`112`	`+ \|`
	`113`	+ = note: expected enum `Option<String>`
	`114`	+ found enum `Option<&mut String>`
	`115`	+help: use `Option::cloned` to clone the value inside the `Option`
	`116`	`+ \|`
	`117`	`+LL \| println!("{}", x == y.cloned());`
	`118`	`+ \| +++++++++`
	`119`	`+`
	`120`	`+error: aborting due to 7 previous errors`
`95`	`121`
`96`	`122`	For more information about this error, try `rustc --explain E0308`.

Comments

(0)