Skip to content

Commit 276b72b

Browse files
committed
---
yaml --- r: 172112 b: refs/heads/beta c: 2b84e44 h: refs/heads/master v: v3
1 parent 985f2aa commit 276b72b

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
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: efaa43ade5cbc6636c955581384324c8f7ace940
34+
refs/heads/beta: 2b84e44b077339e175103979c1c6d4c26b235119
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/beta/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)