Skip to content

Commit 03e76f1

Browse files
committed
---
yaml --- r: 171018 b: refs/heads/try c: 2b84e44 h: refs/heads/master v: v3
1 parent 7199811 commit 03e76f1

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 73a25f55ad748b4d3516417c711b99ce446591af
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 5b3cd3900ceda838f5798c30ab96ceb41f962534
5-
refs/heads/try: efaa43ade5cbc6636c955581384324c8f7ace940
5+
refs/heads/try: 2b84e44b077339e175103979c1c6d4c26b235119
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try/src/liballoc/heap.rs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,9 @@ mod imp {
176176
pub use self::external::{usable_size, stats_print};
177177
}
178178

179-
#[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate"), jemalloc))]
179+
#[cfg(all(not(feature = "external_funcs"),
180+
not(feature = "external_crate"),
181+
jemalloc))]
180182
mod imp {
181183
use core::option::Option;
182184
use core::option::Option::None;
@@ -253,7 +255,10 @@ mod imp {
253255
}
254256
}
255257

256-
#[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate"), not(jemalloc), unix))]
258+
#[cfg(all(not(feature = "external_funcs"),
259+
not(feature = "external_crate"),
260+
not(jemalloc),
261+
unix))]
257262
mod imp {
258263
use core::cmp;
259264
use core::ptr;
@@ -314,7 +319,10 @@ mod imp {
314319
pub fn stats_print() {}
315320
}
316321

317-
#[cfg(all(not(feature = "external_funcs"), not(feature = "external_crate"), not(jemalloc), windows))]
322+
#[cfg(all(not(feature = "external_funcs"),
323+
not(feature = "external_crate"),
324+
not(jemalloc),
325+
windows))]
318326
mod imp {
319327
use libc::{c_void, size_t};
320328
use libc;

0 commit comments

Comments
 (0)