Skip to content

Commit 3e71cca

Browse files
committed
---
yaml --- r: 14677 b: refs/heads/try c: 0e3dd5a h: refs/heads/master i: 14675: 5568b68 v: v3
1 parent dc80eb5 commit 3e71cca

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: dea19b25c90fe7aeb0408214eb1165d0d0081433
5+
refs/heads/try: 0e3dd5a3ee170482f8e314b3f37aa2d1cc8da58c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/core.rc

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export uint, u8, u16, u32, u64;
3333
export float, f32, f64;
3434
export box, char, str, ptr, vec, bool;
3535
export either, option, result, iter;
36-
export ctypes, sys, unsafe, logging;
36+
export libc, os, ctypes, sys, unsafe, logging;
3737
export comm, task, future;
3838
export extfmt;
3939
export math, bessel;
@@ -82,10 +82,7 @@ mod to_str;
8282
// Runtime and language-primitive support
8383

8484
mod libc;
85-
86-
// Rename when transition done.
87-
#[path = "os.rs"]
88-
mod new_os;
85+
mod os;
8986
mod path;
9087

9188
mod ctypes;

branches/try/src/libcore/os.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,8 +542,6 @@ mod consts {
542542
#[cfg(test)]
543543
mod tests {
544544

545-
import os = new_os;
546-
547545
#[test]
548546
fn test() {
549547
assert (!path::path_is_absolute("test-path"));

0 commit comments

Comments
 (0)