---

yaml
---
r: 152673
b: refs/heads/try2
c: 2c3bf88
h: refs/heads/master
i:
  152671: a57a034
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 72f0d4535715505c1cc429ef277a954ba26366bd
+refs/heads/try2: 2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/liballoc/heap.rs

@@ -132,7 +132,7 @@ unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint,
 mod imp {
     use core::option::{None, Option};
     use core::ptr::{RawPtr, mut_null, null};
-    use core::num::Bitwise;
+    use core::num::Int;
     use libc::{c_char, c_int, c_void, size_t};
 
     #[link(name = "jemalloc", kind = "static")]

branches/try2/src/librustc/middle/borrowck/move_data.rs

@@ -163,7 +163,7 @@ pub type AssignDataFlow<'a> = DataFlowContext<'a, AssignDataFlowOperator>;
 
 fn loan_path_is_precise(loan_path: &LoanPath) -> bool {
     match *loan_path {
-        LpVar(_) => {
+        LpVar(_) | LpUpvar(_) => {
             true
         }
         LpExtend(_, _, LpInterior(mc::InteriorElement(_))) => {