Skip to content

Commit 0232eaf

Browse files
Manishearthalexcrichton
authored andcommitted
---
yaml --- r: 187617 b: refs/heads/tmp c: 8eb655b h: refs/heads/master i: 187615: 5eb3c92 v: v3
1 parent 750ca25 commit 0232eaf

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
3636
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
37-
refs/heads/tmp: f17a5220cb71c4f67476738fbbef803265505131
37+
refs/heads/tmp: 8eb655b1e6235c7524aaedefaaae4a6e7bcbd508
3838
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/liballoc/rc.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,10 @@
143143
//! ```
144144
145145
#![stable(feature = "rust1", since = "1.0.0")]
146-
146+
#[cfg(not(test))]
147147
use boxed;
148+
#[cfg(test)]
149+
use std::boxed;
148150
use core::cell::Cell;
149151
use core::clone::Clone;
150152
use core::cmp::{PartialEq, PartialOrd, Eq, Ord, Ordering};

0 commit comments

Comments
 (0)