diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
| commit | dd38f46d71872fba50833fd22313ef49eb01d079 (patch) | |
| tree | f4306baac76c8869273d49e0dd8da0251df4bc2d /src/liblibc/lib.rs | |
| parent | b21a0cee19ab1cdbe57c7f277a9cc9f2658ebce2 (diff) | |
| parent | 321d9ddff21b532300a9ced6ae7ce5f902c0fbf5 (diff) | |
| download | rust-dd38f46d71872fba50833fd22313ef49eb01d079.tar.gz rust-dd38f46d71872fba50833fd22313ef49eb01d079.zip | |
rollup merge of #20708: aturon/new-int-modules
Conflicts: src/libserialize/lib.rs
Diffstat (limited to 'src/liblibc/lib.rs')
| -rw-r--r-- | src/liblibc/lib.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/liblibc/lib.rs b/src/liblibc/lib.rs index 32e635e445d..c39fd074387 100644 --- a/src/liblibc/lib.rs +++ b/src/liblibc/lib.rs @@ -5066,7 +5066,5 @@ pub fn issue_14344_workaround() {} // FIXME #14344 force linkage to happen corre #[doc(hidden)] #[cfg(not(test))] mod std { - #[cfg(stage0)] - pub use core::marker as kinds; pub use core::marker; } |