Skip to content

Commit de25ef8

Browse files
committed
---
yaml --- r: 113847 b: refs/heads/master c: ec8a805 h: refs/heads/master i: 113845: a74fb96 113843: 83db7d1 113839: ee283e1 v: v3
1 parent 5bd5e4d commit de25ef8

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 28624661c3ab16331d134fdbbfb2fd10513e9411
2+
refs/heads/master: ec8a805b6dafc78e692b0a0f8de1a56c5f0dcc0f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: ec0258a381b88b5574e3f8ce72ae553ac3a574b7
55
refs/heads/try: 7c6c492fb2af9a85f21ff952942df3523b22fd17
File renamed without changes.

trunk/src/libcore/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,7 @@ pub mod cast;
2727
pub mod intrinsics;
2828
pub mod mem;
2929
pub mod ptr;
30+
31+
/* Core language traits */
32+
33+
pub mod kinds;

trunk/src/libstd/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ extern crate core;
133133
#[cfg(test)] pub use ty = realstd::ty;
134134
#[cfg(test)] pub use owned = realstd::owned;
135135

136+
#[cfg(not(test))] pub use kinds = core::kinds;
137+
136138
pub use core::cast;
137139
pub use core::intrinsics;
138140
pub use core::mem;
@@ -202,7 +204,6 @@ pub mod gc;
202204

203205
/* Core language traits */
204206

205-
#[cfg(not(test))] pub mod kinds;
206207
#[cfg(not(test))] pub mod ops;
207208
#[cfg(not(test))] pub mod cmp;
208209
#[cfg(not(test))] pub mod ty;

0 commit comments

Comments
 (0)