---

nikomatsakis · nikomatsakis · commit 4dbbaeab450f · 2016-03-18T18:40:22.000-04:00
yaml --- r: 273363 b: refs/heads/beta c: 43aed96 h: refs/heads/master i: 273361: 6e6604c 273359: fb6d490
diff --git a/[refs] b/[refs]
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 25988b645dfa5f56d35a4428e8c5e8c67706aaf4
+refs/heads/beta: 43aed96d0da2cfa6e5da3058c107f3de4a3c009b
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
diff --git a/branches/beta/src/librustc_typeck/check/coercion.rs b/branches/beta/src/librustc_typeck/check/coercion.rs
@@ -367,6 +367,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {
             // `self.x` both have `&mut `type would be a move of
             // `self.x`, but we auto-coerce it to `foo(&mut *self.x)`,
             // which is a borrow.
+            assert_eq!(mt_b.mutbl, hir::MutImmutable); // can only coerce &T -> &U
             return self.identity(ty);
         }
         let r_borrow = match ty.sty {

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> {`
`367`	`367`	// `self.x` both have `&mut `type would be a move of
`368`	`368`	// `self.x`, but we auto-coerce it to `foo(&mut *self.x)`,
`369`	`369`	`// which is a borrow.`
	`370`	`+ assert_eq!(mt_b.mutbl, hir::MutImmutable); // can only coerce &T -> &U`
`370`	`371`	`return self.identity(ty);`
`371`	`372`	`}`
`372`	`373`	`let r_borrow = match ty.sty {`