Skip to content

Commit 38ce05c

Browse files
Manishearthalexcrichton
authored andcommitted
---
yaml --- r: 187195 b: refs/heads/try c: 8eb655b h: refs/heads/master i: 187193: 703d775 187191: c945159 v: v3
1 parent c6b9d09 commit 38ce05c

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
@@ -2,7 +2,7 @@
22
refs/heads/master: b4c965ee803a4521d8b4575f634e036f93e408f3
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 3a96d6a9818fe2affc98a187fb1065120458cee9
5-
refs/heads/try: f17a5220cb71c4f67476738fbbef803265505131
5+
refs/heads/try: 8eb655b1e6235c7524aaedefaaae4a6e7bcbd508
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

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