Skip to content

Commit 49c9ac1

Browse files
committed
Silence non-implicitly-copyable-typarams in coretest
1 parent ffa5d76 commit 49c9ac1

File tree

8 files changed

+69
-61
lines changed

8 files changed

+69
-61
lines changed

src/libcore/flate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ fn inflate_buf(buf: &[const u8]) -> ~[u8] {
5555
}
5656

5757
#[test]
58+
#[allow(non_implicitly_copyable_typarams)]
5859
fn test_flate_round_trip() {
5960
let r = rand::Rng();
6061
let mut words = ~[];

src/libcore/future.rs

Lines changed: 57 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -174,66 +174,69 @@ proto! future_pipe (
174174
}
175175
)
176176

177-
#[test]
178-
fn test_from_value() {
179-
let f = from_value(~"snail");
180-
assert get(&f) == ~"snail";
181-
}
177+
#[allow(non_implicitly_copyable_typarams)]
178+
mod test {
179+
#[test]
180+
fn test_from_value() {
181+
let f = from_value(~"snail");
182+
assert get(&f) == ~"snail";
183+
}
182184

183-
#[test]
184-
fn test_from_port() {
185-
let (po, ch) = future_pipe::init();
186-
future_pipe::server::completed(ch, ~"whale");
187-
let f = from_port(po);
188-
assert get(&f) == ~"whale";
189-
}
185+
#[test]
186+
fn test_from_port() {
187+
let (po, ch) = future_pipe::init();
188+
future_pipe::server::completed(ch, ~"whale");
189+
let f = from_port(po);
190+
assert get(&f) == ~"whale";
191+
}
190192

191-
#[test]
192-
fn test_from_fn() {
193-
let f = from_fn(|| ~"brail");
194-
assert get(&f) == ~"brail";
195-
}
193+
#[test]
194+
fn test_from_fn() {
195+
let f = from_fn(|| ~"brail");
196+
assert get(&f) == ~"brail";
197+
}
196198

197-
#[test]
198-
fn test_interface_get() {
199-
let f = from_value(~"fail");
200-
assert f.get() == ~"fail";
201-
}
199+
#[test]
200+
fn test_interface_get() {
201+
let f = from_value(~"fail");
202+
assert f.get() == ~"fail";
203+
}
202204

203-
#[test]
204-
fn test_with() {
205-
let f = from_value(~"nail");
206-
assert with(&f, |v| *v) == ~"nail";
207-
}
205+
#[test]
206+
fn test_with() {
207+
let f = from_value(~"nail");
208+
assert with(&f, |v| copy *v) == ~"nail";
209+
}
208210

209-
#[test]
210-
fn test_get_ref_method() {
211-
let f = from_value(22);
212-
assert *f.get_ref() == 22;
213-
}
211+
#[test]
212+
fn test_get_ref_method() {
213+
let f = from_value(22);
214+
assert *f.get_ref() == 22;
215+
}
214216

215-
#[test]
216-
fn test_get_ref_fn() {
217-
let f = from_value(22);
218-
assert *get_ref(&f) == 22;
219-
}
217+
#[test]
218+
fn test_get_ref_fn() {
219+
let f = from_value(22);
220+
assert *get_ref(&f) == 22;
221+
}
220222

221-
#[test]
222-
fn test_interface_with() {
223-
let f = from_value(~"kale");
224-
assert f.with(|v| *v) == ~"kale";
225-
}
223+
#[test]
224+
fn test_interface_with() {
225+
let f = from_value(~"kale");
226+
assert f.with(|v| copy *v) == ~"kale";
227+
}
226228

227-
#[test]
228-
fn test_spawn() {
229-
let f = spawn(|| ~"bale");
230-
assert get(&f) == ~"bale";
231-
}
229+
#[test]
230+
fn test_spawn() {
231+
let f = spawn(|| ~"bale");
232+
assert get(&f) == ~"bale";
233+
}
232234

233-
#[test]
234-
#[should_fail]
235-
#[ignore(cfg(target_os = "win32"))]
236-
fn test_futurefail() {
237-
let f = spawn(|| fail);
238-
let _x: ~str = get(&f);
239-
}
235+
#[test]
236+
#[should_fail]
237+
#[ignore(cfg(target_os = "win32"))]
238+
fn test_futurefail() {
239+
let f = spawn(|| fail);
240+
let _x: ~str = get(&f);
241+
}
242+
}

src/libcore/os.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,7 @@ fn arch() -> ~str { ~"x86_64" }
827827
fn arch() -> str { ~"arm" }
828828

829829
#[cfg(test)]
830+
#[allow(non_implicitly_copyable_typarams)]
830831
mod tests {
831832

832833
#[test]
@@ -893,7 +894,7 @@ mod tests {
893894
let e = env();
894895
assert vec::len(e) > 0u;
895896
for vec::each(e) |p| {
896-
let (n, v) = p;
897+
let (n, v) = copy p;
897898
log(debug, n);
898899
let v2 = getenv(n);
899900
// MingW seems to set some funky environment variables like
@@ -909,7 +910,7 @@ mod tests {
909910

910911
let mut e = env();
911912
setenv(n, ~"VALUE");
912-
assert !vec::contains(e, (n, ~"VALUE"));
913+
assert !vec::contains(e, (copy n, ~"VALUE"));
913914

914915
e = env();
915916
assert vec::contains(e, (n, ~"VALUE"));

src/libcore/result.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ impl<T:Eq,U:Eq> Result<T,U> : Eq {
376376
}
377377

378378
#[cfg(test)]
379+
#[allow(non_implicitly_copyable_typarams)]
379380
mod tests {
380381
fn op1() -> result::Result<int, ~str> { result::Ok(666) }
381382

src/libcore/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3099,7 +3099,7 @@ mod tests {
30993099
0x000a_u16 ]) ];
31003100

31013101
for vec::each(pairs) |p| {
3102-
let (s, u) = p;
3102+
let (s, u) = copy p;
31033103
assert to_utf16(s) == u;
31043104
assert from_utf16(u) == s;
31053105
assert from_utf16(to_utf16(s)) == s;

src/libcore/to_str.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ impl<A: ToStr> ~A: ToStr {
8484
}
8585

8686
#[cfg(test)]
87+
#[allow(non_implicitly_copyable_typarams)]
8788
mod tests {
8889
#[test]
8990
fn test_simple_types() {

src/libcore/tuple.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ impl<A: Ord, B: Ord, C: Ord> (A, B, C): Ord {
144144
}
145145

146146
#[test]
147+
#[allow(non_implicitly_copyable_typarams)]
147148
fn test_tuple() {
148149
assert (948, 4039.48).first() == 948;
149150
assert (34.5, ~"foo").second() == ~"foo";

src/libcore/vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2381,19 +2381,19 @@ mod tests {
23812381
let mut results: ~[~[int]];
23822382

23832383
results = ~[];
2384-
permute(~[], |v| vec::push(results, v));
2384+
permute(~[], |v| vec::push(results, copy v));
23852385
assert results == ~[~[]];
23862386

23872387
results = ~[];
2388-
permute(~[7], |v| results += ~[v]);
2388+
permute(~[7], |v| results += ~[copy v]);
23892389
assert results == ~[~[7]];
23902390

23912391
results = ~[];
2392-
permute(~[1,1], |v| results += ~[v]);
2392+
permute(~[1,1], |v| results += ~[copy v]);
23932393
assert results == ~[~[1,1],~[1,1]];
23942394

23952395
results = ~[];
2396-
permute(~[5,2,0], |v| results += ~[v]);
2396+
permute(~[5,2,0], |v| results += ~[copy v]);
23972397
assert results ==
23982398
~[~[5,2,0],~[5,0,2],~[2,5,0],~[2,0,5],~[0,5,2],~[0,2,5]];
23992399
}

0 commit comments

Comments
 (0)