Skip to content

Commit 2c3bf88

Browse files
committed
Merge conflicts from the rollup
Closes rust-lang#14480 (vim: Add :RustRun and associated commands) Closes rust-lang#14917 (Deprecate free-standing endian conversions in favor of methods on Int. Merge Bitwise into Int and add more bit operations.) Closes rust-lang#14981 (librustc: Use expr_ty_adjusted in trans_overloaded_call.) Closes rust-lang#14989 (std::task - Revamp TaskBuilder API) Closes rust-lang#14997 (Reject double moves out of array elements) Closes rust-lang#14998 (Vim: highlight escapes for byte literals.) Closes rust-lang#15002 (Fix FIXME rust-lang#5275) Closes rust-lang#15004 (Fix rust-lang#14865) Closes rust-lang#15007 (debuginfo: Add test case for issue rust-lang#14411.) Closes rust-lang#15012 ((doc) Change search placeholder text.) Closes rust-lang#15013 (Update compiler-rt.) Closes rust-lang#15017 (Deprecate the bytes!() macro.)
1 parent 72f0d45 commit 2c3bf88

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/liballoc/heap.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ unsafe fn closure_exchange_malloc(drop_glue: fn(*mut u8), size: uint,
132132
mod imp {
133133
use core::option::{None, Option};
134134
use core::ptr::{RawPtr, mut_null, null};
135-
use core::num::Bitwise;
135+
use core::num::Int;
136136
use libc::{c_char, c_int, c_void, size_t};
137137

138138
#[link(name = "jemalloc", kind = "static")]

src/librustc/middle/borrowck/move_data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ pub type AssignDataFlow<'a> = DataFlowContext<'a, AssignDataFlowOperator>;
163163

164164
fn loan_path_is_precise(loan_path: &LoanPath) -> bool {
165165
match *loan_path {
166-
LpVar(_) => {
166+
LpVar(_) | LpUpvar(_) => {
167167
true
168168
}
169169
LpExtend(_, _, LpInterior(mc::InteriorElement(_))) => {

0 commit comments

Comments
 (0)