From 2421312deab6311dc9b4cd8b610f799c07f50071 Mon Sep 17 00:00:00 2001
From: Michael Sullivan <sully@msully.net>
Date: Fri, 12 Aug 2011 15:01:13 -0700
Subject: [PATCH] Don't rely on binop autoderef in the compiler.

---
 src/comp/front/test.rs    | 2 +-
 src/comp/middle/typeck.rs | 2 +-
 src/test/stdtest/test.rs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/comp/front/test.rs b/src/comp/front/test.rs
index 8604b648808..2616c320804 100644
--- a/src/comp/front/test.rs
+++ b/src/comp/front/test.rs
@@ -30,7 +30,7 @@ fn modify_for_testing(crate: @ast::crate) -> @ast::crate {
     let next_node_id_fn =
         @bind fn (next_node_id: @mutable ast::node_id) -> ast::node_id {
                   let this_node_id = *next_node_id;
-                  *next_node_id = next_node_id + 1;
+                  *next_node_id += 1;
                   ret this_node_id;
               }(next_node_id);
 
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index 4b91c353e71..7bbd8a800d6 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -2472,7 +2472,7 @@ fn check_expr_with_unifier(fcx: &@fn_ctxt, expr: &@ast::expr,
 
 fn next_ty_var_id(fcx: @fn_ctxt) -> int {
     let id = *fcx.next_var_id;
-    *fcx.next_var_id = fcx.next_var_id + 1;
+    *fcx.next_var_id += 1;
     ret id;
 }
 
diff --git a/src/test/stdtest/test.rs b/src/test/stdtest/test.rs
index fd6f8831bf9..6526ee6531b 100644
--- a/src/test/stdtest/test.rs
+++ b/src/test/stdtest/test.rs
@@ -13,7 +13,7 @@ fn do_not_run_ignored_tests() {
 
     test::run_test(desc, test::default_test_to_task);
 
-    assert (ran == false);
+    assert (*ran == false);
 }
 
 #[test]