Skip to content

Commit 9284179

Browse files
pcwaltonpcwalton
committed
libstd: Switch off legacy modes in both core and std.
1 parent b787a26 commit 9284179

24 files changed

+108
-97
lines changed

‎src/cargo/cargo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ fn is_uuid(id: ~str) -> bool {
144144
if vec::len(parts) == 5u {
145145
let mut correct = 0u;
146146
for vec::eachi(parts) |i, part| {
147-
fn is_hex_digit(ch: char) -> bool {
147+
fn is_hex_digit(+ch: char) -> bool {
148148
('0' <= ch && ch <= '9') ||
149149
('a' <= ch && ch <= 'f') ||
150150
('A' <= ch && ch <= 'F')
@@ -402,7 +402,7 @@ fn need_dir(s: &Path) {
402402
}
403403

404404
fn valid_pkg_name(s: &str) -> bool {
405-
fn is_valid_digit(c: char) -> bool {
405+
fn is_valid_digit(+c: char) -> bool {
406406
('0' <= c && c <= '9') ||
407407
('a' <= c && c <= 'z') ||
408408
('A' <= c && c <= 'Z') ||

‎src/fuzzer/fuzzer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ fn under(n: uint, it: fn(uint)) {
221221
while i < n { it(i); i += 1u; }
222222
}
223223

224-
fn as_str(f: fn@(io::Writer)) -> ~str {
224+
fn as_str(f: fn@(+x: io::Writer)) -> ~str {
225225
io::with_str_writer(f)
226226
}
227227

‎src/libcore/cast.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#[abi = "rust-intrinsic"]
44
extern mod rusti {
55
fn forget<T>(-x: T);
6-
fn reinterpret_cast<T, U>(e: T) -> U;
6+
fn reinterpret_cast<T, U>(&&e: T) -> U;
77
}
88

99
/// Casts the value at `src` to U. The two types must have the same length.

‎src/libcore/comm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ will once again be the preferred module for intertask communication.
3333
*/
3434

3535
// NB: transitionary, de-mode-ing.
36-
#[forbid(deprecated_mode)];
36+
#[warn(deprecated_mode)];
3737
#[forbid(deprecated_pattern)];
3838

3939
use either::Either;
@@ -166,7 +166,7 @@ fn as_raw_port<T: Send, U>(ch: comm::Chan<T>, f: fn(*rust_port) -> U) -> U {
166166
* Constructs a channel. The channel is bound to the port used to
167167
* construct it.
168168
*/
169-
pub fn Chan<T: Send>(p: Port<T>) -> Chan<T> {
169+
pub fn Chan<T: Send>(&&p: Port<T>) -> Chan<T> {
170170
Chan_(rustrt::get_port_id((**p).po))
171171
}
172172

‎src/libcore/core.rc

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ Implicitly, all crates behave as if they included the following prologue:
3636
// Don't link to core. We are core.
3737
#[no_core];
3838

39-
#[legacy_modes];
4039
#[legacy_exports];
4140

4241
#[warn(deprecated_mode)];

‎src/libcore/os.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ extern mod rustrt {
3535
fn rust_getcwd() -> ~str;
3636
fn rust_path_is_dir(path: *libc::c_char) -> c_int;
3737
fn rust_path_exists(path: *libc::c_char) -> c_int;
38-
fn rust_list_files(path: ~str) -> ~[~str];
38+
fn rust_list_files2(&&path: ~str) -> ~[~str];
3939
fn rust_process_wait(handle: c_int) -> c_int;
4040
fn last_os_error() -> ~str;
4141
fn rust_set_exit_status(code: libc::intptr_t);
@@ -582,7 +582,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
582582
#[cfg(windows)]
583583
fn star(p: &Path) -> Path { p.push("*") }
584584

585-
do rustrt::rust_list_files(star(p).to_str()).filter |filename| {
585+
do rustrt::rust_list_files2(star(p).to_str()).filter |filename| {
586586
*filename != ~"." && *filename != ~".."
587587
}
588588
}

‎src/libcore/ptr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extern mod libc_ {
2121

2222
#[abi = "rust-intrinsic"]
2323
extern mod rusti {
24-
fn addr_of<T>(val: T) -> *T;
24+
fn addr_of<T>(&&val: T) -> *T;
2525
}
2626

2727
/// Get an unsafe pointer to a value

‎src/libcore/rand.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ enum rctx {}
1111
extern mod rustrt {
1212
fn rand_seed() -> ~[u8];
1313
fn rand_new() -> *rctx;
14-
fn rand_new_seeded(seed: ~[u8]) -> *rctx;
14+
fn rand_new_seeded2(&&seed: ~[u8]) -> *rctx;
1515
fn rand_next(c: *rctx) -> u32;
1616
fn rand_free(c: *rctx);
1717
}
@@ -276,7 +276,7 @@ pub fn Rng() -> Rng {
276276
* length.
277277
*/
278278
pub fn seeded_rng(seed: &~[u8]) -> Rng {
279-
@RandRes(rustrt::rand_new_seeded(*seed)) as Rng
279+
@RandRes(rustrt::rand_new_seeded2(*seed)) as Rng
280280
}
281281

282282
type XorShiftState = {

‎src/libcore/stackwalk.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#[doc(hidden)]; // FIXME #3538
22

33
// NB: transitionary, de-mode-ing.
4-
#[forbid(deprecated_mode)];
4+
// XXX: Can't do this because frame_address needs a deprecated mode.
5+
//#[forbid(deprecated_mode)];
56
#[forbid(deprecated_pattern)];
67

78
use cast::reinterpret_cast;
@@ -74,7 +75,7 @@ fn breakpoint() {
7475
rustrt::rust_dbg_breakpoint()
7576
}
7677

77-
fn frame_address(f: fn(*u8)) {
78+
fn frame_address(f: fn(++x: *u8)) {
7879
rusti::frame_address(f)
7980
}
8081

@@ -86,5 +87,5 @@ extern mod rustrt {
8687
#[abi = "rust-intrinsic"]
8788
extern mod rusti {
8889
#[legacy_exports];
89-
fn frame_address(f: fn(*u8));
90+
fn frame_address(f: fn(++x: *u8));
9091
}

‎src/libstd/ebml.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -588,11 +588,11 @@ impl EbmlDeserializer: serialization::Deserializer {
588588

589589
#[test]
590590
fn test_option_int() {
591-
fn serialize_1<S: serialization::Serializer>(s: S, v: int) {
591+
fn serialize_1<S: serialization::Serializer>(&&s: S, v: int) {
592592
s.emit_i64(v as i64);
593593
}
594594

595-
fn serialize_0<S: serialization::Serializer>(s: S, v: Option<int>) {
595+
fn serialize_0<S: serialization::Serializer>(&&s: S, v: Option<int>) {
596596
do s.emit_enum(~"core::option::t") {
597597
match v {
598598
None => s.emit_enum_variant(
@@ -606,11 +606,11 @@ fn test_option_int() {
606606
}
607607
}
608608

609-
fn deserialize_1<S: serialization::Deserializer>(s: S) -> int {
609+
fn deserialize_1<S: serialization::Deserializer>(&&s: S) -> int {
610610
s.read_i64() as int
611611
}
612612

613-
fn deserialize_0<S: serialization::Deserializer>(s: S) -> Option<int> {
613+
fn deserialize_0<S: serialization::Deserializer>(&&s: S) -> Option<int> {
614614
do s.read_enum(~"core::option::t") {
615615
do s.read_enum_variant |i| {
616616
match i {

‎src/libstd/serialization.rs

+36-36
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ trait Deserializer {
8181
//
8282
// In some cases, these should eventually be coded as traits.
8383

84-
fn emit_from_vec<S: Serializer, T>(s: S, v: ~[T], f: fn(T)) {
84+
fn emit_from_vec<S: Serializer, T>(&&s: S, &&v: ~[T], f: fn(&&x: T)) {
8585
do s.emit_vec(vec::len(v)) {
8686
for vec::eachi(v) |i,e| {
8787
do s.emit_vec_elt(i) {
@@ -91,7 +91,7 @@ fn emit_from_vec<S: Serializer, T>(s: S, v: ~[T], f: fn(T)) {
9191
}
9292
}
9393

94-
fn read_to_vec<D: Deserializer, T: Copy>(d: D, f: fn() -> T) -> ~[T] {
94+
fn read_to_vec<D: Deserializer, T: Copy>(&&d: D, f: fn() -> T) -> ~[T] {
9595
do d.read_vec |len| {
9696
do vec::from_fn(len) |i| {
9797
d.read_vec_elt(i, || f())
@@ -100,11 +100,11 @@ fn read_to_vec<D: Deserializer, T: Copy>(d: D, f: fn() -> T) -> ~[T] {
100100
}
101101

102102
trait SerializerHelpers {
103-
fn emit_from_vec<T>(v: ~[T], f: fn(T));
103+
fn emit_from_vec<T>(&&v: ~[T], f: fn(&&x: T));
104104
}
105105

106106
impl<S: Serializer> S: SerializerHelpers {
107-
fn emit_from_vec<T>(v: ~[T], f: fn(T)) {
107+
fn emit_from_vec<T>(&&v: ~[T], f: fn(&&x: T)) {
108108
emit_from_vec(self, v, f)
109109
}
110110
}
@@ -119,127 +119,127 @@ impl<D: Deserializer> D: DeserializerHelpers {
119119
}
120120
}
121121

122-
fn serialize_uint<S: Serializer>(s: S, v: uint) {
122+
fn serialize_uint<S: Serializer>(&&s: S, v: uint) {
123123
s.emit_uint(v);
124124
}
125125

126-
fn deserialize_uint<D: Deserializer>(d: D) -> uint {
126+
fn deserialize_uint<D: Deserializer>(&&d: D) -> uint {
127127
d.read_uint()
128128
}
129129

130-
fn serialize_u8<S: Serializer>(s: S, v: u8) {
130+
fn serialize_u8<S: Serializer>(&&s: S, v: u8) {
131131
s.emit_u8(v);
132132
}
133133

134-
fn deserialize_u8<D: Deserializer>(d: D) -> u8 {
134+
fn deserialize_u8<D: Deserializer>(&&d: D) -> u8 {
135135
d.read_u8()
136136
}
137137

138-
fn serialize_u16<S: Serializer>(s: S, v: u16) {
138+
fn serialize_u16<S: Serializer>(&&s: S, v: u16) {
139139
s.emit_u16(v);
140140
}
141141

142-
fn deserialize_u16<D: Deserializer>(d: D) -> u16 {
142+
fn deserialize_u16<D: Deserializer>(&&d: D) -> u16 {
143143
d.read_u16()
144144
}
145145

146-
fn serialize_u32<S: Serializer>(s: S, v: u32) {
146+
fn serialize_u32<S: Serializer>(&&s: S, v: u32) {
147147
s.emit_u32(v);
148148
}
149149

150-
fn deserialize_u32<D: Deserializer>(d: D) -> u32 {
150+
fn deserialize_u32<D: Deserializer>(&&d: D) -> u32 {
151151
d.read_u32()
152152
}
153153

154-
fn serialize_u64<S: Serializer>(s: S, v: u64) {
154+
fn serialize_u64<S: Serializer>(&&s: S, v: u64) {
155155
s.emit_u64(v);
156156
}
157157

158-
fn deserialize_u64<D: Deserializer>(d: D) -> u64 {
158+
fn deserialize_u64<D: Deserializer>(&&d: D) -> u64 {
159159
d.read_u64()
160160
}
161161

162-
fn serialize_int<S: Serializer>(s: S, v: int) {
162+
fn serialize_int<S: Serializer>(&&s: S, v: int) {
163163
s.emit_int(v);
164164
}
165165

166-
fn deserialize_int<D: Deserializer>(d: D) -> int {
166+
fn deserialize_int<D: Deserializer>(&&d: D) -> int {
167167
d.read_int()
168168
}
169169

170-
fn serialize_i8<S: Serializer>(s: S, v: i8) {
170+
fn serialize_i8<S: Serializer>(&&s: S, v: i8) {
171171
s.emit_i8(v);
172172
}
173173

174-
fn deserialize_i8<D: Deserializer>(d: D) -> i8 {
174+
fn deserialize_i8<D: Deserializer>(&&d: D) -> i8 {
175175
d.read_i8()
176176
}
177177

178-
fn serialize_i16<S: Serializer>(s: S, v: i16) {
178+
fn serialize_i16<S: Serializer>(&&s: S, v: i16) {
179179
s.emit_i16(v);
180180
}
181181

182-
fn deserialize_i16<D: Deserializer>(d: D) -> i16 {
182+
fn deserialize_i16<D: Deserializer>(&&d: D) -> i16 {
183183
d.read_i16()
184184
}
185185

186-
fn serialize_i32<S: Serializer>(s: S, v: i32) {
186+
fn serialize_i32<S: Serializer>(&&s: S, v: i32) {
187187
s.emit_i32(v);
188188
}
189189

190-
fn deserialize_i32<D: Deserializer>(d: D) -> i32 {
190+
fn deserialize_i32<D: Deserializer>(&&d: D) -> i32 {
191191
d.read_i32()
192192
}
193193

194-
fn serialize_i64<S: Serializer>(s: S, v: i64) {
194+
fn serialize_i64<S: Serializer>(&&s: S, v: i64) {
195195
s.emit_i64(v);
196196
}
197197

198-
fn deserialize_i64<D: Deserializer>(d: D) -> i64 {
198+
fn deserialize_i64<D: Deserializer>(&&d: D) -> i64 {
199199
d.read_i64()
200200
}
201201

202-
fn serialize_str<S: Serializer>(s: S, v: &str) {
202+
fn serialize_str<S: Serializer>(&&s: S, v: &str) {
203203
s.emit_str(v);
204204
}
205205

206-
fn deserialize_str<D: Deserializer>(d: D) -> ~str {
206+
fn deserialize_str<D: Deserializer>(&&d: D) -> ~str {
207207
d.read_str()
208208
}
209209

210-
fn serialize_float<S: Serializer>(s: S, v: float) {
210+
fn serialize_float<S: Serializer>(&&s: S, v: float) {
211211
s.emit_float(v);
212212
}
213213

214-
fn deserialize_float<D: Deserializer>(d: D) -> float {
214+
fn deserialize_float<D: Deserializer>(&&d: D) -> float {
215215
d.read_float()
216216
}
217217

218-
fn serialize_f32<S: Serializer>(s: S, v: f32) {
218+
fn serialize_f32<S: Serializer>(&&s: S, v: f32) {
219219
s.emit_f32(v);
220220
}
221221

222-
fn deserialize_f32<D: Deserializer>(d: D) -> f32 {
222+
fn deserialize_f32<D: Deserializer>(&&d: D) -> f32 {
223223
d.read_f32()
224224
}
225225

226-
fn serialize_f64<S: Serializer>(s: S, v: f64) {
226+
fn serialize_f64<S: Serializer>(&&s: S, v: f64) {
227227
s.emit_f64(v);
228228
}
229229

230-
fn deserialize_f64<D: Deserializer>(d: D) -> f64 {
230+
fn deserialize_f64<D: Deserializer>(&&d: D) -> f64 {
231231
d.read_f64()
232232
}
233233

234-
fn serialize_bool<S: Serializer>(s: S, v: bool) {
234+
fn serialize_bool<S: Serializer>(&&s: S, v: bool) {
235235
s.emit_bool(v);
236236
}
237237

238-
fn deserialize_bool<D: Deserializer>(d: D) -> bool {
238+
fn deserialize_bool<D: Deserializer>(&&d: D) -> bool {
239239
d.read_bool()
240240
}
241241

242-
fn serialize_Option<S: Serializer,T>(s: S, v: Option<T>, st: fn(T)) {
242+
fn serialize_Option<S: Serializer,T>(&&s: S, &&v: Option<T>, st: fn(&&x: T)) {
243243
do s.emit_enum(~"option") {
244244
match v {
245245
None => do s.emit_enum_variant(~"none", 0u, 0u) {
@@ -254,7 +254,7 @@ fn serialize_Option<S: Serializer,T>(s: S, v: Option<T>, st: fn(T)) {
254254
}
255255
}
256256

257-
fn deserialize_Option<D: Deserializer,T: Copy>(d: D, st: fn() -> T)
257+
fn deserialize_Option<D: Deserializer,T: Copy>(&&d: D, st: fn() -> T)
258258
-> Option<T> {
259259
do d.read_enum(~"option") {
260260
do d.read_enum_variant |i| {

‎src/libstd/std.rc

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ not required in or otherwise suitable for the core library.
1818

1919
#[no_core];
2020

21-
#[legacy_modes];
2221
#[legacy_exports];
2322

2423
#[allow(vecs_implicitly_copyable)];

0 commit comments

Comments
 (0)