From 2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Wed, 18 Jun 2014 17:05:15 -0700
Subject: [PATCH] Merge conflicts from the rollup

Closes #14480 (vim: Add :RustRun and associated commands)
Closes #14917 (Deprecate free-standing endian conversions in favor of methods on Int. Merge Bitwise into Int and add more bit operations.)
Closes #14981 (librustc: Use expr_ty_adjusted in trans_overloaded_call.)
Closes #14989 (std::task - Revamp TaskBuilder API)
Closes #14997 (Reject double moves out of array elements)
Closes #14998 (Vim: highlight escapes for byte literals.)
Closes #15002 (Fix FIXME #5275)
Closes #15004 (Fix #14865)
Closes #15007 (debuginfo: Add test case for issue #14411.)
Closes #15012 ((doc) Change search placeholder text.)
Closes #15013 (Update compiler-rt.)
Closes #15017 (Deprecate the bytes!() macro.)
---
 src/liballoc/heap.rs                      | 2 +-
 src/librustc/middle/borrowck/move_data.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/liballoc/heap.rs b/src/liballoc/heap.rs
index 79a616b9555aa..b4d0057778a1a 100644
--- a/src/liballoc/heap.rs
+++ b/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")]
diff --git a/src/librustc/middle/borrowck/move_data.rs b/src/librustc/middle/borrowck/move_data.rs
index 9c2194c74f4a4..b61596908e60a 100644
--- a/src/librustc/middle/borrowck/move_data.rs
+++ b/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(_))) => {