Skip to content

Commit 4b01d11

Browse files
committed
Organize std.rc and make exports explicit
1 parent 35affdf commit 4b01d11

File tree

1 file changed

+77
-51
lines changed

1 file changed

+77
-51
lines changed

src/lib/std.rc

Lines changed: 77 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,91 @@
33
uuid = "122bed0b-c19b-4b82-b0b7-7ae8aead7297",
44
url = "http://rust-lang.org/src/std")];
55

6-
#[comment = "Rust standard library"];
6+
#[comment = "The Rust standard library"];
77
#[license = "BSD"];
88

9-
// Built-in types support modules.
109

10+
export box, char, float, int, str, ptr, uint, u8, u32, u64, vec;
11+
export aio, comm, fs, io, net, run, sio, sys, task;
12+
export ctypes, either, option, result, util;
13+
export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap, ufind;
14+
export ebml, dbg, getopts, math, rand, sha1, term, time, unsafe;
15+
export extfmt, test;
16+
// FIXME: generic_os and os_fs shouldn't be exported
17+
export generic_os, os, os_fs;
18+
19+
20+
// Built-in types support modules
21+
22+
mod box;
1123
mod char;
24+
mod float;
1225
mod int;
26+
mod str;
27+
mod ptr;
1328
mod uint;
1429
mod u8;
1530
mod u32;
1631
mod u64;
1732
mod vec;
18-
mod str;
19-
mod float;
2033

21-
// General io and system-services modules.
2234

35+
// General io and system-services modules
36+
37+
mod aio;
38+
mod comm;
39+
mod fs;
2340
mod io;
41+
mod net;
42+
mod run = "run_program.rs";
43+
mod sio;
2444
mod sys;
2545
mod task;
26-
mod comm;
2746

28-
// Utility modules.
2947

48+
// Utility modules
49+
50+
mod ctypes;
3051
mod either;
3152
mod option;
53+
mod result;
3254
mod util;
33-
mod ctypes;
3455

35-
// Authorize various rule-bendings.
3656

37-
auth io = unsafe;
38-
auth fs = unsafe;
39-
auth os_fs = unsafe;
40-
auth run = unsafe;
41-
auth str = unsafe;
42-
auth vec = unsafe;
43-
auth task = unsafe;
57+
// Collections
4458

45-
auth dbg = unsafe;
59+
mod bitv;
60+
mod deque;
61+
mod fun_treemap;
62+
mod list;
63+
mod map;
64+
mod smallintmap;
65+
mod sort;
66+
mod treemap;
67+
mod ufind;
68+
69+
70+
// And ... other stuff
71+
72+
mod ebml;
73+
mod dbg;
74+
mod getopts;
75+
mod math;
76+
mod rand;
77+
mod sha1;
78+
mod term;
79+
mod time;
80+
mod unsafe;
81+
82+
#[cfg(unicode)]
83+
mod unicode;
84+
85+
86+
// Compiler support modules
87+
88+
mod extfmt;
89+
mod test;
4690

47-
auth uint::next_power_of_two = unsafe;
48-
auth map::mk_hashmap = unsafe;
49-
auth rand::mk_rng = unsafe;
5091

5192
// Target-os module.
5293

@@ -68,39 +109,24 @@ mod os = "linux_os.rs";
68109
#[cfg(target_os = "linux")]
69110
mod os_fs = "posix_fs.rs";
70111

71-
mod run = "run_program.rs";
72-
mod fs;
73-
mod aio;
74-
mod sio;
75-
mod net;
76112

77-
// FIXME: parametric
78-
mod map;
79-
mod treemap;
80-
mod fun_treemap;
81-
mod deque;
82-
mod list;
83-
mod rand;
84-
mod dbg;
85-
mod bitv;
86-
mod sort;
87-
mod sha1;
88-
mod ebml;
89-
mod ufind;
90-
mod extfmt;
91-
mod box;
92-
mod getopts;
93-
mod time;
94-
mod smallintmap;
95-
mod ptr;
96-
mod test;
97-
mod unsafe;
98-
mod term;
99-
mod math;
100-
mod result;
113+
// FIXME: This doesn't do anything.
114+
// Authorize various rule-bendings.
115+
116+
auth io = unsafe;
117+
auth fs = unsafe;
118+
auth os_fs = unsafe;
119+
auth run = unsafe;
120+
auth str = unsafe;
121+
auth vec = unsafe;
122+
auth task = unsafe;
123+
124+
auth dbg = unsafe;
125+
126+
auth uint::next_power_of_two = unsafe;
127+
auth map::mk_hashmap = unsafe;
128+
auth rand::mk_rng = unsafe;
101129

102-
#[cfg(unicode)]
103-
mod unicode;
104130

105131
// Local Variables:
106132
// mode: rust;

0 commit comments

Comments
 (0)