Skip to content

Commit f27ad3d

Browse files
committed
Clean up rustc warnings.
compiletest: compact "linux" "macos" etc.as "unix". liballoc: remove a superfluous "use". libcollections: remove invocations of deprecated methods in favor of their suggested replacements and use "_" for a loop counter. libcoretest: remove invocations of deprecated methods; also add "allow(deprecated)" for testing a deprecated method itself. libglob: use "cfg_attr". libgraphviz: add a test for one of data constructors. libgreen: remove a superfluous "use". libnum: "allow(type_overflow)" for type cast into u8 in a test code. librustc: names of static variables should be in upper case. libserialize: v[i] instead of get(). libstd/ascii: to_lowercase() instead of to_lower(). libstd/bitflags: modify AnotherSetOfFlags to use i8 as its backend. It will serve better for testing various aspects of bitflags!. libstd/collections: "allow(deprecated)" for testing a deprecated method itself. libstd/io: remove invocations of deprecated methods and superfluous "use". Also add #[test] where it was missing. libstd/num: introduce a helper function to effectively remove invocations of a deprecated method. libstd/path and rand: remove invocations of deprecated methods and superfluous "use". libstd/task and libsync/comm: "allow(deprecated)" for testing a deprecated method itself. libsync/deque: remove superfluous "unsafe". libsync/mutex and once: names of static variables should be in upper case. libterm: introduce a helper function to effectively remove invocations of a deprecated method. We still see a few warnings about using obsoleted native::task::spawn() in the test modules for libsync. I'm not sure how I should replace them with std::task::TaksBuilder and native::task::NativeTaskBuilder (dependency to libstd?) Signed-off-by: NODA, Kai <nodakai@gmail.com>
1 parent a6e0c76 commit f27ad3d

File tree

40 files changed

+264
-221
lines changed

40 files changed

+264
-221
lines changed

src/compiletest/runtest.rs

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -947,15 +947,12 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError> ,
947947
String::from_chars(c.as_slice())
948948
}
949949

950-
#[cfg(target_os = "windows")]
950+
#[cfg(windows)]
951951
fn prefix_matches( line : &str, prefix : &str ) -> bool {
952952
to_lower(line).as_slice().starts_with(to_lower(prefix).as_slice())
953953
}
954954

955-
#[cfg(any(target_os = "linux",
956-
target_os = "macos",
957-
target_os = "freebsd",
958-
target_os = "dragonfly"))]
955+
#[cfg(unix)]
959956
fn prefix_matches( line : &str, prefix : &str ) -> bool {
960957
line.starts_with( prefix )
961958
}
@@ -1356,24 +1353,21 @@ fn program_output(config: &Config, testfile: &Path, lib_path: &str, prog: String
13561353
}
13571354

13581355
// Linux and mac don't require adjusting the library search path
1359-
#[cfg(any(target_os = "linux",
1360-
target_os = "macos",
1361-
target_os = "freebsd",
1362-
target_os = "dragonfly"))]
1356+
#[cfg(unix)]
13631357
fn make_cmdline(_libpath: &str, prog: &str, args: &[String]) -> String {
13641358
format!("{} {}", prog, args.connect(" "))
13651359
}
13661360

1367-
#[cfg(target_os = "windows")]
1361+
#[cfg(windows)]
13681362
fn make_cmdline(libpath: &str, prog: &str, args: &[String]) -> String {
1369-
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
1370-
}
13711363

1372-
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
1373-
// for diagnostic purposes
1374-
#[cfg(target_os = "windows")]
1375-
fn lib_path_cmd_prefix(path: &str) -> String {
1376-
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
1364+
// Build the LD_LIBRARY_PATH variable as it would be seen on the command line
1365+
// for diagnostic purposes
1366+
fn lib_path_cmd_prefix(path: &str) -> String {
1367+
format!("{}=\"{}\"", util::lib_path_env_var(), util::make_new_path(path))
1368+
}
1369+
1370+
format!("{} {} {}", lib_path_cmd_prefix(libpath), prog, args.connect(" "))
13771371
}
13781372

13791373
fn dump_output(config: &Config, testfile: &Path, out: &str, err: &str) {

src/liballoc/arc.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,6 @@ impl<T: Sync + Send> Drop for Weak<T> {
276276
#[allow(experimental)]
277277
mod tests {
278278
use std::clone::Clone;
279-
use std::collections::MutableSeq;
280279
use std::comm::channel;
281280
use std::mem::drop;
282281
use std::ops::Drop;

src/libcollections/bitv.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2659,7 +2659,7 @@ mod tests {
26592659
let mut r = rng();
26602660
let mut bitv = Bitv::with_capacity(BENCH_BITS, false);
26612661
b.iter(|| {
2662-
for i in range(0u, 100) {
2662+
for _ in range(0u, 100) {
26632663
bitv.set((r.next_u32() as uint) % BENCH_BITS, r.gen());
26642664
}
26652665
&bitv

src/libcollections/dlist.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,13 +890,13 @@ mod tests {
890890
}
891891

892892
let v = vec![1i,2,3,4,5];
893-
let u = vec![9i,8,1,2,3,4,5];
893+
let mut u = vec![9i,8,1,2,3,4,5];
894894
let mut m = list_from(v.as_slice());
895895
m.prepend(list_from(u.as_slice()));
896896
check_links(&m);
897-
let sum = u.append(v.as_slice());
898-
assert_eq!(sum.len(), m.len());
899-
for elt in sum.into_iter() {
897+
u.extend(v.as_slice().iter().map(|&b| b));
898+
assert_eq!(u.len(), m.len());
899+
for elt in u.into_iter() {
900900
assert_eq!(m.pop_front(), Some(elt))
901901
}
902902
}

src/libcollections/ringbuf.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,10 @@ mod tests {
611611
assert_eq!(deq.len(), 3);
612612
deq.push_front(a.clone());
613613
assert_eq!(deq.len(), 4);
614-
assert_eq!((*deq.get(0)).clone(), a.clone());
615-
assert_eq!((*deq.get(1)).clone(), b.clone());
616-
assert_eq!((*deq.get(2)).clone(), c.clone());
617-
assert_eq!((*deq.get(3)).clone(), d.clone());
614+
assert_eq!(deq[0].clone(), a.clone());
615+
assert_eq!(deq[1].clone(), b.clone());
616+
assert_eq!(deq[2].clone(), c.clone());
617+
assert_eq!(deq[3].clone(), d.clone());
618618
}
619619

620620
#[test]
@@ -626,7 +626,7 @@ mod tests {
626626
assert_eq!(deq.len(), 66);
627627

628628
for i in range(0u, 66) {
629-
assert_eq!(*deq.get(i), 65 - i);
629+
assert_eq!(deq[i], 65 - i);
630630
}
631631

632632
let mut deq = RingBuf::new();
@@ -635,7 +635,7 @@ mod tests {
635635
}
636636

637637
for i in range(0u, 66) {
638-
assert_eq!(*deq.get(i), i);
638+
assert_eq!(deq[i], i);
639639
}
640640
}
641641

src/libcollections/str.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,7 @@ mod tests {
883883
use std::slice::{AsSlice, ImmutableSlice};
884884
use string::String;
885885
use vec::Vec;
886+
use slice::CloneableVector;
886887

887888
use unicode::char::UnicodeChar;
888889

@@ -1504,7 +1505,7 @@ mod tests {
15041505
fn vec_str_conversions() {
15051506
let s1: String = String::from_str("All mimsy were the borogoves");
15061507

1507-
let v: Vec<u8> = Vec::from_slice(s1.as_bytes());
1508+
let v: Vec<u8> = s1.as_bytes().to_vec();
15081509
let s2: String = String::from_str(from_utf8(v.as_slice()).unwrap());
15091510
let mut i: uint = 0u;
15101511
let n1: uint = s1.len();

src/libcollections/string.rs

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,6 +1036,7 @@ mod tests {
10361036
use str::{Str, StrSlice, Owned};
10371037
use super::{as_string, String};
10381038
use vec::Vec;
1039+
use slice::CloneableVector;
10391040

10401041
#[test]
10411042
fn test_as_string() {
@@ -1051,15 +1052,15 @@ mod tests {
10511052

10521053
#[test]
10531054
fn test_from_utf8() {
1054-
let xs = Vec::from_slice(b"hello");
1055+
let xs = b"hello".to_vec();
10551056
assert_eq!(String::from_utf8(xs), Ok(String::from_str("hello")));
10561057

1057-
let xs = Vec::from_slice("ศไทย中华Việt Nam".as_bytes());
1058+
let xs = "ศไทย中华Việt Nam".as_bytes().to_vec();
10581059
assert_eq!(String::from_utf8(xs), Ok(String::from_str("ศไทย中华Việt Nam")));
10591060

1060-
let xs = Vec::from_slice(b"hello\xFF");
1061+
let xs = b"hello\xFF".to_vec();
10611062
assert_eq!(String::from_utf8(xs),
1062-
Err(Vec::from_slice(b"hello\xFF")));
1063+
Err(b"hello\xFF".to_vec()));
10631064
}
10641065

10651066
#[test]
@@ -1211,7 +1212,8 @@ mod tests {
12111212
fn test_push_bytes() {
12121213
let mut s = String::from_str("ABC");
12131214
unsafe {
1214-
s.push_bytes([b'D']);
1215+
let mv = s.as_mut_vec();
1216+
mv.push_all([b'D']);
12151217
}
12161218
assert_eq!(s.as_slice(), "ABCD");
12171219
}
@@ -1239,17 +1241,18 @@ mod tests {
12391241
}
12401242

12411243
#[test]
1242-
fn test_pop_char() {
1244+
fn test_pop() {
12431245
let mut data = String::from_str("ประเทศไทย中华b¢€𤭢");
1244-
assert_eq!(data.pop_char().unwrap(), '𤭢'); // 4 bytes
1245-
assert_eq!(data.pop_char().unwrap(), '€'); // 3 bytes
1246-
assert_eq!(data.pop_char().unwrap(), '¢'); // 2 bytes
1247-
assert_eq!(data.pop_char().unwrap(), 'b'); // 1 bytes
1248-
assert_eq!(data.pop_char().unwrap(), '华');
1246+
assert_eq!(data.pop().unwrap(), '𤭢'); // 4 bytes
1247+
assert_eq!(data.pop().unwrap(), '€'); // 3 bytes
1248+
assert_eq!(data.pop().unwrap(), '¢'); // 2 bytes
1249+
assert_eq!(data.pop().unwrap(), 'b'); // 1 bytes
1250+
assert_eq!(data.pop().unwrap(), '华');
12491251
assert_eq!(data.as_slice(), "ประเทศไทย中");
12501252
}
12511253

12521254
#[test]
1255+
#[allow(deprecated)] // use remove(0) instead
12531256
fn test_shift_char() {
12541257
let mut data = String::from_str("𤭢€¢b华ประเทศไทย中");
12551258
assert_eq!(data.shift_char().unwrap(), '𤭢'); // 4 bytes

src/libcollections/vec.rs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2266,8 +2266,8 @@ mod tests {
22662266
}
22672267

22682268
#[test]
2269-
fn test_mut_slice_from() {
2270-
let mut values = Vec::from_slice([1u8,2,3,4,5]);
2269+
fn test_slice_from_mut() {
2270+
let mut values = vec![1u8,2,3,4,5];
22712271
{
22722272
let slice = values.slice_from_mut(2);
22732273
assert!(slice == [3, 4, 5]);
@@ -2280,8 +2280,8 @@ mod tests {
22802280
}
22812281

22822282
#[test]
2283-
fn test_mut_slice_to() {
2284-
let mut values = Vec::from_slice([1u8,2,3,4,5]);
2283+
fn test_slice_to_mut() {
2284+
let mut values = vec![1u8,2,3,4,5];
22852285
{
22862286
let slice = values.slice_to_mut(2);
22872287
assert!(slice == [1, 2]);
@@ -2294,8 +2294,8 @@ mod tests {
22942294
}
22952295

22962296
#[test]
2297-
fn test_mut_split_at() {
2298-
let mut values = Vec::from_slice([1u8,2,3,4,5]);
2297+
fn test_split_at_mut() {
2298+
let mut values = vec![1u8,2,3,4,5];
22992299
{
23002300
let (left, right) = values.split_at_mut(2);
23012301
{
@@ -2315,7 +2315,7 @@ mod tests {
23152315
}
23162316
}
23172317

2318-
assert!(values == Vec::from_slice([2u8, 3, 5, 6, 7]));
2318+
assert!(values == vec![2u8, 3, 5, 6, 7]);
23192319
}
23202320

23212321
#[test]
@@ -2355,16 +2355,16 @@ mod tests {
23552355

23562356
#[test]
23572357
fn test_grow_fn() {
2358-
let mut v = Vec::from_slice([0u, 1]);
2358+
let mut v = vec![0u, 1];
23592359
v.grow_fn(3, |i| i);
2360-
assert!(v == Vec::from_slice([0u, 1, 0, 1, 2]));
2360+
assert!(v == vec![0u, 1, 0, 1, 2]);
23612361
}
23622362

23632363
#[test]
23642364
fn test_retain() {
2365-
let mut vec = Vec::from_slice([1u, 2, 3, 4]);
2365+
let mut vec = vec![1u, 2, 3, 4];
23662366
vec.retain(|x| x%2 == 0);
2367-
assert!(vec == Vec::from_slice([2u, 4]));
2367+
assert!(vec == vec![2u, 4]);
23682368
}
23692369

23702370
#[test]
@@ -2567,32 +2567,32 @@ mod tests {
25672567

25682568
#[test]
25692569
fn test_move_items() {
2570-
let mut vec = vec!(1i, 2, 3);
2571-
let mut vec2 : Vec<int> = vec!();
2570+
let vec = vec![1, 2, 3];
2571+
let mut vec2 : Vec<i32> = vec![];
25722572
for i in vec.into_iter() {
25732573
vec2.push(i);
25742574
}
2575-
assert!(vec2 == vec!(1i, 2, 3));
2575+
assert!(vec2 == vec![1, 2, 3]);
25762576
}
25772577

25782578
#[test]
25792579
fn test_move_items_reverse() {
2580-
let mut vec = vec!(1i, 2, 3);
2581-
let mut vec2 : Vec<int> = vec!();
2580+
let vec = vec![1, 2, 3];
2581+
let mut vec2 : Vec<i32> = vec![];
25822582
for i in vec.into_iter().rev() {
25832583
vec2.push(i);
25842584
}
2585-
assert!(vec2 == vec!(3i, 2, 1));
2585+
assert!(vec2 == vec![3, 2, 1]);
25862586
}
25872587

25882588
#[test]
25892589
fn test_move_items_zero_sized() {
2590-
let mut vec = vec!((), (), ());
2591-
let mut vec2 : Vec<()> = vec!();
2590+
let vec = vec![(), (), ()];
2591+
let mut vec2 : Vec<()> = vec![];
25922592
for i in vec.into_iter() {
25932593
vec2.push(i);
25942594
}
2595-
assert!(vec2 == vec!((), (), ()));
2595+
assert!(vec2 == vec![(), (), ()]);
25962596
}
25972597

25982598
#[test]
@@ -2707,7 +2707,7 @@ mod tests {
27072707
b.bytes = src_len as u64;
27082708

27092709
b.iter(|| {
2710-
let dst = Vec::from_slice(src.clone().as_slice());
2710+
let dst = src.clone().as_slice().to_vec();
27112711
assert_eq!(dst.len(), src_len);
27122712
assert!(dst.iter().enumerate().all(|(i, x)| i == *x));
27132713
});
@@ -2871,7 +2871,7 @@ mod tests {
28712871

28722872
b.iter(|| {
28732873
let mut dst = dst.clone();
2874-
dst.push_all_move(src.clone());
2874+
dst.extend(src.clone().into_iter());
28752875
assert_eq!(dst.len(), dst_len + src_len);
28762876
assert!(dst.iter().enumerate().all(|(i, x)| i == *x));
28772877
});

src/libcoretest/char.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ fn test_is_digit() {
117117
fn test_escape_default() {
118118
fn string(c: char) -> String {
119119
let mut result = String::new();
120-
escape_default(c, |c| { result.push_char(c); });
120+
escape_default(c, |c| { result.push(c); });
121121
return result;
122122
}
123123
let s = string('\n');
@@ -152,7 +152,7 @@ fn test_escape_default() {
152152
fn test_escape_unicode() {
153153
fn string(c: char) -> String {
154154
let mut result = String::new();
155-
escape_unicode(c, |c| { result.push_char(c); });
155+
escape_unicode(c, |c| { result.push(c); });
156156
return result;
157157
}
158158
let s = string('\x00');

src/libcoretest/iter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,7 @@ fn bench_multiple_take(b: &mut Bencher) {
868868
let mut it = range(0u, 42).cycle();
869869
b.iter(|| {
870870
let n = it.next().unwrap();
871-
for m in range(0u, n) {
871+
for _ in range(0u, n) {
872872
it.take(it.next().unwrap()).all(|_| true);
873873
}
874874
});

src/libcoretest/mem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn test_transmute() {
109109
}
110110

111111
unsafe {
112-
assert!(Vec::from_slice([76u8]) == transmute("L".to_string()));
112+
assert!(vec![76u8] == transmute("L".to_string()));
113113
}
114114
}
115115

src/libcoretest/result.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ fn test_collect() {
8989
}
9090

9191
#[test]
92+
#[allow(deprecated)] // we know fold_ is deprecated
9293
fn test_fold() {
9394
assert_eq!(fold_(range(0i, 0)
9495
.map(|_| Ok::<(), ()>(()))),

src/libglob/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ mod test {
682682
}
683683

684684
#[test]
685-
#[ignore(cfg(windows))] // FIXME (#9406)
685+
#[cfg_attr(windows, ignore)] // FIXME (#9406)
686686
fn test_lots_of_files() {
687687
// this is a good test because it touches lots of differently named files
688688
glob("/*/*/*/*").skip(10000).next();

src/libgraphviz/lib.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,20 @@ r#"digraph single_edge {
735735
"#);
736736
}
737737

738+
#[test]
739+
fn test_some_labelled() {
740+
let labels : Trivial = SomeNodesLabelled(vec![Some("A"), None]);
741+
let result = test_input(LabelledGraph::new("test_some_labelled", labels,
742+
vec![edge(0, 1, "A-1")]));
743+
assert_eq!(result.unwrap().as_slice(),
744+
r#"digraph test_some_labelled {
745+
N0[label="A"];
746+
N1[label="N1"];
747+
N0 -> N1[label="A-1"];
748+
}
749+
"#);
750+
}
751+
738752
#[test]
739753
fn single_cyclic_node() {
740754
let labels : Trivial = UnlabelledNodes(1);

0 commit comments

Comments
 (0)