Skip to content

Commit 1dd40f9

Browse files
committed
---
yaml --- r: 118754 b: refs/heads/snap-stage3 c: 2c3bf88 h: refs/heads/master v: v3
1 parent 44fe166 commit 1dd40f9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: b1646cbfd908dc948b251e362669af421100647a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 72f0d4535715505c1cc429ef277a954ba26366bd
4+
refs/heads/snap-stage3: 2c3bf8836f6f0cd18d8ac4f7189615f7f4098f5d
55
refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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")]

branches/snap-stage3/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)