---

yaml
---
r: 94538
b: refs/heads/try
c: 09589aa
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: c9432327c4bacaccbf7602f916f450ab27dbe49e
+refs/heads/try: 09589aae4f36aeb1bb028e0f3e4f2bbc697412b2
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/middle/typeck/check/_match.rs

@@ -25,7 +25,7 @@ use syntax::parse::token;
 use syntax::codemap::Span;
 use syntax::print::pprust;
 
-pub fn check_match(fcx: @mut FnCtxt,
+pub fn check_match(fcx: @FnCtxt,
                    expr: @ast::Expr,
                    discrim: @ast::Expr,
                    arms: &[ast::Arm]) {
@@ -102,7 +102,7 @@ pub fn check_match(fcx: @mut FnCtxt,
 }
 
 pub struct pat_ctxt {
-    fcx: @mut FnCtxt,
+    fcx: @FnCtxt,
     map: PatIdMap,
 }
 

branches/try/src/librustc/middle/typeck/check/demand.rs

@@ -20,17 +20,17 @@ use syntax::codemap::Span;
 
 // Requires that the two types unify, and prints an error message if they
 // don't.
-pub fn suptype(fcx: @mut FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
+pub fn suptype(fcx: @FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
     suptype_with_fn(fcx, sp, false, expected, actual,
         |sp, e, a, s| { fcx.report_mismatched_types(sp, e, a, s) })
 }
 
-pub fn subtype(fcx: @mut FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
+pub fn subtype(fcx: @FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
     suptype_with_fn(fcx, sp, true, actual, expected,
         |sp, a, e, s| { fcx.report_mismatched_types(sp, e, a, s) })
 }
 
-pub fn suptype_with_fn(fcx: @mut FnCtxt,
+pub fn suptype_with_fn(fcx: @FnCtxt,
                        sp: Span,
                        b_is_expected: bool,
                        ty_a: ty::t,
@@ -46,7 +46,7 @@ pub fn suptype_with_fn(fcx: @mut FnCtxt,
     }
 }
 
-pub fn eqtype(fcx: @mut FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
+pub fn eqtype(fcx: @FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
     match infer::mk_eqty(fcx.infcx(), false, infer::Misc(sp), actual, expected) {
         Ok(()) => { /* ok */ }
         Err(ref err) => {
@@ -56,10 +56,7 @@ pub fn eqtype(fcx: @mut FnCtxt, sp: Span, expected: ty::t, actual: ty::t) {
 }
 
 // Checks that the type `actual` can be coerced to `expected`.
-pub fn coerce(fcx: @mut FnCtxt,
-              sp: Span,
-              expected: ty::t,
-              expr: @ast::Expr) {
+pub fn coerce(fcx: @FnCtxt, sp: Span, expected: ty::t, expr: @ast::Expr) {
     let expr_ty = fcx.expr_ty(expr);
     match fcx.mk_assignty(expr, expr_ty, expected) {
       result::Ok(()) => { /* ok */ }

branches/try/src/librustc/middle/typeck/check/method.rs

@@ -118,7 +118,7 @@ pub enum AutoderefReceiverFlag {
 }
 
 pub fn lookup(
-        fcx: @mut FnCtxt,
+        fcx: @FnCtxt,
 
         // In a call `a.b::<X, Y, ...>(...)`:
         expr: @ast::Expr,                   // The expression `a.b(...)`.
@@ -168,7 +168,7 @@ pub fn lookup(
 }
 
 pub struct LookupContext<'a> {
-    fcx: @mut FnCtxt,
+    fcx: @FnCtxt,
     expr: @ast::Expr,
     self_expr: @ast::Expr,
     callee_id: NodeId,
@@ -1245,7 +1245,7 @@ impl<'a> LookupContext<'a> {
             }
         }
 
-        fn rcvr_matches_ty(fcx: @mut FnCtxt,
+        fn rcvr_matches_ty(fcx: @FnCtxt,
                            rcvr_ty: ty::t,
                            candidate: &Candidate) -> bool {
             match candidate.rcvr_match_condition {