auto merge of #6774 : alexcrichton/rust/silence-warnings, r=catamorphism

bors · bors · commit c7037586d3a6 · 2013-05-28T06:20:01.000-07:00
Also as a bonus this fixes #6767
diff --git a/mk/tests.mk b/mk/tests.mk
@@ -284,7 +284,7 @@ define TEST_RUNNER
 # If NO_REBUILD is set then break the dependencies on extra so we can
 # test crates without rebuilding std and extra first
 ifeq ($(NO_REBUILD),)
-STDTESTDEP_$(1)_$(2)_$(3) = $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB_$(2))
+STDTESTDEP_$(1)_$(2)_$(3) = $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_EXTRALIB_$(2))
 else
 STDTESTDEP_$(1)_$(2)_$(3) =
 endif
diff --git a/src/libextra/arc.rs b/src/libextra/arc.rs
@@ -510,7 +510,6 @@ mod tests {
     use core::prelude::*;
     use core::cell::Cell;
     use arc::*;
-    use arc;
 
     #[test]
     fn manually_share_arc() {
diff --git a/src/libextra/bitv.rs b/src/libextra/bitv.rs
@@ -1197,7 +1197,7 @@ mod tests {
     #[test]
     fn test_from_bytes() {
         let bitv = from_bytes([0b10110110, 0b00000000, 0b11111111]);
-        let str = ~"10110110" + ~"00000000" + ~"11111111";
+        let str = ~"10110110" + "00000000" + "11111111";
         assert_eq!(bitv.to_str(), str);
     }
 
diff --git a/src/libextra/flatpipes.rs b/src/libextra/flatpipes.rs
@@ -927,7 +927,7 @@ mod test {
         fn test_try_recv_none3<P:BytePort>(loader: PortLoader<P>) {
             static CONTINUE: [u8, ..4] = [0xAA, 0xBB, 0xCC, 0xDD];
             // The control word is followed by garbage
-            let bytes = CONTINUE.to_vec() + ~[0];
+            let bytes = CONTINUE.to_vec() + [0];
             let port = loader(bytes);
             let res: Option<int> = port.try_recv();
             assert!(res.is_none());
@@ -951,7 +951,7 @@ mod test {
                     1, sys::size_of::<u64>()) |len_bytes| {
                     len_bytes.to_vec()
                 };
-                let bytes = CONTINUE.to_vec() + len_bytes + ~[0, 0, 0, 0];
+                let bytes = CONTINUE.to_vec() + len_bytes + [0, 0, 0, 0];
 
                 let port = loader(bytes);
 
diff --git a/src/libextra/json.rs b/src/libextra/json.rs
@@ -1880,13 +1880,13 @@ mod tests {
                   ]));
         assert_eq!(result::unwrap(from_str(
                       ~"{" +
-                          ~"\"a\": 1.0, " +
-                          ~"\"b\": [" +
-                              ~"true," +
-                              ~"\"foo\\nbar\", " +
-                              ~"{ \"c\": {\"d\": null} } " +
-                          ~"]" +
-                      ~"}")),
+                          "\"a\": 1.0, " +
+                          "\"b\": [" +
+                              "true," +
+                              "\"foo\\nbar\", " +
+                              "{ \"c\": {\"d\": null} } " +
+                          "]" +
+                      "}")),
                   mk_object([
                       (~"a", Number(1.0f)),
                       (~"b", List(~[
diff --git a/src/libextra/net_ip.rs b/src/libextra/net_ip.rs
@@ -375,7 +375,6 @@ mod test {
     use uv;
 
     use core::result;
-    use core::vec;
 
     #[test]
     fn test_ip_ipv4_parse_and_format_ip() {
diff --git a/src/libextra/sha1.rs b/src/libextra/sha1.rs
@@ -317,7 +317,7 @@ mod tests {
             Test {
                 input:
                      ~"abcdbcdecdefdefgefghfghighij" +
-                     ~"hijkijkljklmklmnlmnomnopnopq",
+                     "hijkijkljklmklmnlmnomnopnopq",
                 output: ~[
                     0x84u8, 0x98u8, 0x3Eu8, 0x44u8,
                     0x1Cu8, 0x3Bu8, 0xD2u8, 0x6Eu8,
diff --git a/src/libextra/sort.rs b/src/libextra/sort.rs
@@ -746,8 +746,6 @@ fn shift_vec<T:Copy>(dest: &mut [T],
 
 #[cfg(test)]
 mod test_qsort3 {
-    use core::prelude::*;
-
     use sort::*;
 
     use core::vec;
diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs
@@ -720,7 +720,6 @@ mod tests {
 
     use core::cast;
     use core::cell::Cell;
-    use core::ptr;
     use core::result;
     use core::task;
     use core::vec;
diff --git a/src/libextra/tempfile.rs b/src/libextra/tempfile.rs
@@ -30,7 +30,6 @@ mod tests {
     use core::prelude::*;
 
     use tempfile::mkdtemp;
-    use tempfile;
     use core::os;
 
     #[test]
diff --git a/src/libextra/time.rs b/src/libextra/time.rs
@@ -1205,8 +1205,8 @@ mod tests {
         // abbreviation.
         let rfc822 = local.rfc822();
         let prefix = ~"Fri, 13 Feb 2009 15:31:30 ";
-        assert!(rfc822 == prefix + ~"PST" ||
-                     rfc822 == prefix + ~"Pacific Standard Time");
+        assert!(rfc822 == prefix + "PST" ||
+                     rfc822 == prefix + "Pacific Standard Time");
 
         assert_eq!(local.ctime(), ~"Fri Feb 13 15:31:30 2009");
         assert_eq!(local.rfc822z(), ~"Fri, 13 Feb 2009 15:31:30 -0800");
diff --git a/src/libextra/uv_global_loop.rs b/src/libextra/uv_global_loop.rs
@@ -126,9 +126,7 @@ mod test {
     use uv::ll;
     use uv_iotask::IoTask;
 
-    use core::old_iter;
     use core::libc;
-    use core::ptr;
     use core::task;
     use core::cast::transmute;
     use core::libc::c_void;
@@ -228,7 +226,7 @@ mod test {
         for cycles.times {
             exit_po.recv();
         };
-        debug!(~"test_stress_gl_uv_global_loop_high_level_global_timer"+
-            ~" exiting successfully!");
+        debug!("test_stress_gl_uv_global_loop_high_level_global_timer \
+                exiting successfully!");
     }
 }
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc
@@ -139,7 +139,7 @@ pub fn stash_expr_if(c: @fn(@ast::expr, test_mode)->bool,
                      e: @ast::expr,
                      tm: test_mode) {
     if c(e, tm) {
-        *es = *es + ~[e];
+        *es = *es + [e];
     } else {
         /* now my indices are wrong :( */
     }
@@ -425,7 +425,7 @@ pub fn check_running(exe_filename: &Path) -> happiness {
     let p = run::process_output(
         "/Users/jruderman/scripts/timed_run_rust_program.py",
         [exe_filename.to_str()]);
-    let comb = str::from_bytes(p.output) + ~"\n" + str::from_bytes(p.error);
+    let comb = str::from_bytes(p.output) + "\n" + str::from_bytes(p.error);
     if str::len(comb) > 1u {
         error!("comb comb comb: %?", comb);
     }
diff --git a/src/librustc/back/rpath.rs b/src/librustc/back/rpath.rs
@@ -174,7 +174,7 @@ pub fn get_absolute_rpath(lib: &Path) -> Path {
 pub fn get_install_prefix_rpath(target_triple: &str) -> Path {
     let install_prefix = env!("CFG_PREFIX");
 
-    if install_prefix == ~"" {
+    if install_prefix == "" {
         fail!("rustc compiled without CFG_PREFIX environment variable");
     }
 
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
@@ -641,7 +641,7 @@ pub fn build_session_options(binary: @~str,
               ~"3" => Aggressive,
               _ => {
                 early_error(demitter, ~"optimization level needs " +
-                            ~"to be between 0-3")
+                            "to be between 0-3")
               }
             }
         } else { No }
@@ -925,7 +925,6 @@ mod test {
     use driver::driver::{build_configuration, build_session};
     use driver::driver::{build_session_options, optgroups, str_input};
 
-    use extra::getopts::groups::getopts;
     use extra::getopts;
     use syntax::attr;
     use syntax::diagnostic;
@@ -934,7 +933,7 @@ mod test {
     #[test]
     fn test_switch_implies_cfg_test() {
         let matches =
-            &match getopts(~[~"--test"], optgroups()) {
+            &match getopts([~"--test"], optgroups()) {
               Ok(copy m) => m,
               Err(copy f) => fail!("test_switch_implies_cfg_test: %s", getopts::fail_str(f))
             };
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs
@@ -384,8 +384,8 @@ mod test {
 
     fn make_crate(with_bin: bool, with_lib: bool) -> @ast::crate {
         let mut attrs = ~[];
-        if with_bin { attrs += ~[make_crate_type_attr(~"bin")]; }
-        if with_lib { attrs += ~[make_crate_type_attr(~"lib")]; }
+        if with_bin { attrs += [make_crate_type_attr(~"bin")]; }
+        if with_lib { attrs += [make_crate_type_attr(~"lib")]; }
         @codemap::respan(codemap::dummy_sp(), ast::crate_ {
             module: ast::_mod { view_items: ~[], items: ~[] },
             attrs: attrs,
diff --git a/src/librustc/lib/llvm.rs b/src/librustc/lib/llvm.rs
@@ -1980,7 +1980,7 @@ pub fn type_to_str_inner(names: @TypeNames, outer0: &[TypeRef], ty: TypeRef)
             let mut s = ~"";
             let mut first: bool = true;
             for tys.each |t| {
-                if first { first = false; } else { s += ~", "; }
+                if first { first = false; } else { s += ", "; }
                 s += type_to_str_inner(names, outer, *t).to_owned();
             }
             // [Note at-str] FIXME #2543: Could rewrite this without the copy,
diff --git a/src/librustc/middle/trans/shape.rs b/src/librustc/middle/trans/shape.rs
@@ -66,7 +66,7 @@ Although these two functions are never called, they are here
 for a VERY GOOD REASON. See #3670
 */
 pub fn add_u16(dest: &mut ~[u8], val: u16) {
-    *dest += ~[(val & 0xffu16) as u8, (val >> 8u16) as u8];
+    *dest += [(val & 0xffu16) as u8, (val >> 8u16) as u8];
 }
 
 pub fn add_substr(dest: &mut ~[u8], src: ~[u8]) {
diff --git a/src/librustc/rustc.rc b/src/librustc/rustc.rc
@@ -157,7 +157,7 @@ pub fn version(argv0: &str) {
 pub fn usage(argv0: &str) {
     let message = fmt!("Usage: %s [OPTIONS] INPUT", argv0);
     io::println(groups::usage(message, optgroups()) +
-                ~"Additional help:
+                "Additional help:
     -W help             Print 'lint' options and default settings
     -Z help             Print internal options for debugging rustc
 ");
diff --git a/src/librustdoc/attr_parser.rs b/src/librustdoc/attr_parser.rs
@@ -78,7 +78,6 @@ mod test {
     fn parse_attributes(source: ~str) -> ~[ast::attribute] {
         use syntax::parse;
         use syntax::parse::attr::parser_attr;
-        use syntax::codemap;
 
         let parse_sess = syntax::parse::new_parse_sess(None);
         let parser = parse::new_parser_from_source_str(
diff --git a/src/librustdoc/desc_to_brief_pass.rs b/src/librustdoc/desc_to_brief_pass.rs
@@ -166,15 +166,15 @@ pub fn paragraphs(s: &str) -> ~[~str] {
             accum = if str::is_empty(accum) {
                 copy *line
             } else {
-                accum + ~"\n" + *line
+                accum + "\n" + *line
             }
         }
 
         res
     };
 
     if !accum.is_empty() {
-        paras + ~[accum]
+        paras + [accum]
     } else {
         paras
     }
diff --git a/src/librustdoc/markdown_pass.rs b/src/librustdoc/markdown_pass.rs
@@ -171,7 +171,7 @@ pub fn header_kind(doc: doc::ItemTag) -> ~str {
 }
 
 pub fn header_name(doc: doc::ItemTag) -> ~str {
-    let fullpath = str::connect(doc.path() + ~[doc.name()], "::");
+    let fullpath = str::connect(doc.path() + [doc.name()], "::");
     match &doc {
         &doc::ModTag(_) if doc.id() != syntax::ast::crate_node_id => {
             fullpath
@@ -190,9 +190,9 @@ pub fn header_name(doc: doc::ItemTag) -> ~str {
             let mut trait_part = ~"";
             for doc.trait_types.eachi |i, trait_type| {
                 if i == 0 {
-                    trait_part += ~" of ";
+                    trait_part += " of ";
                 } else {
-                    trait_part += ~", ";
+                    trait_part += ", ";
                 }
                 trait_part += *trait_type;
             }
@@ -668,7 +668,7 @@ mod test {
                     assert!(str::contains(markdown, "% Crate core"));
                 }
                 doc::ItemPage(_) => {
-                    assert!(str::contains(markdown, ~"% Module a"));
+                    assert!(str::contains(markdown, "% Module a"));
                 }
             }
         }
diff --git a/src/librustdoc/markdown_writer.rs b/src/librustdoc/markdown_writer.rs
@@ -38,7 +38,7 @@ impl WriterUtils for Writer {
     }
 
     fn put_line(&self, str: ~str) {
-        self.put_str(str + ~"\n");
+        self.put_str(str + "\n");
     }
 
     fn put_done(&self) {
@@ -159,7 +159,7 @@ pub fn make_filename(
             }
           }
           doc::ItemPage(doc) => {
-            str::connect(doc.path() + ~[doc.name()], "_")
+            str::connect(doc.path() + [doc.name()], "_")
           }
         }
     };
diff --git a/src/librustdoc/page_pass.rs b/src/librustdoc/page_pass.rs
@@ -69,7 +69,7 @@ fn make_doc_from_pages(page_port: &PagePort) -> doc::Doc {
     loop {
         let val = page_port.recv();
         if val.is_some() {
-            pages += ~[val.unwrap()];
+            pages += [val.unwrap()];
         } else {
             break;
         }
diff --git a/src/librustdoc/pass.rs b/src/librustdoc/pass.rs
@@ -48,7 +48,7 @@ fn test_run_passes() {
                 doc::CratePage(doc::CrateDoc{
                     topmod: doc::ModDoc{
                         item: doc::ItemDoc {
-                            name: doc.cratemod().name() + ~"two",
+                            name: doc.cratemod().name() + "two",
                             .. copy doc.cratemod().item
                         },
                         items: ~[],
@@ -67,7 +67,7 @@ fn test_run_passes() {
                 doc::CratePage(doc::CrateDoc{
                     topmod: doc::ModDoc{
                         item: doc::ItemDoc {
-                            name: doc.cratemod().name() + ~"three",
+                            name: doc.cratemod().name() + "three",
                             .. copy doc.cratemod().item
                         },
                         items: ~[],
diff --git a/src/librustdoc/sectionalize_pass.rs b/src/librustdoc/sectionalize_pass.rs
@@ -113,7 +113,7 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
         match parse_header(copy *line) {
           Some(header) => {
             if current_section.is_some() {
-                sections += ~[(&current_section).get()];
+                sections += [(&current_section).get()];
             }
             current_section = Some(doc::Section {
                 header: header,
@@ -124,14 +124,14 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
             match copy current_section {
               Some(section) => {
                 current_section = Some(doc::Section {
-                    body: section.body + ~"\n" + *line,
+                    body: section.body + "\n" + *line,
                     .. section
                 });
               }
               None => {
                 new_desc = match copy new_desc {
                   Some(desc) => {
-                    Some(desc + ~"\n" + *line)
+                    Some(desc + "\n" + *line)
                   }
                   None => {
                     Some(copy *line)
@@ -144,7 +144,7 @@ fn sectionalize(desc: Option<~str>) -> (Option<~str>, ~[doc::Section]) {
     }
 
     if current_section.is_some() {
-        sections += ~[current_section.get()];
+        sections += [current_section.get()];
     }
 
     (new_desc, sections)
diff --git a/src/librusti/rusti.rc b/src/librusti/rusti.rc
@@ -272,11 +272,11 @@ fn run_cmd(repl: &mut Repl, _in: @io::Reader, _out: @io::Writer,
         ~"help" => {
             io::println(
                 ~":{\\n ..lines.. \\n:}\\n - execute multiline command\n" +
-                ~":load <crate> ... - \
+                ":load <crate> ... - \
                   loads given crates as dynamic libraries\n" +
-                ~":clear - clear the bindings\n" +
-                ~":exit - exit from the repl\n" +
-                ~":help - show this message");
+                ":clear - clear the bindings\n" +
+                ":exit - exit from the repl\n" +
+                ":help - show this message");
         }
         ~"load" => {
             let mut loaded_crates: ~[~str] = ~[];
@@ -317,10 +317,10 @@ fn run_cmd(repl: &mut Repl, _in: @io::Reader, _out: @io::Writer,
                 match get_line(use_rl, "rusti| ") {
                     None => fail!("unterminated multiline command :{ .. :}"),
                     Some(line) => {
-                        if str::trim(line) == ~":}" {
+                        if str::trim(line) == ":}" {
                             end_multiline = true;
                         } else {
-                            multiline_cmd += line + ~"\n";
+                            multiline_cmd += line + "\n";
                         }
                     }
                 }
diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
diff --git a/src/libstd/at_vec.rs b/src/libstd/at_vec.rs
diff --git a/src/libstd/hash.rs b/src/libstd/hash.rs
diff --git a/src/libstd/logging.rs b/src/libstd/logging.rs
diff --git a/src/libstd/num/int_macros.rs b/src/libstd/num/int_macros.rs
diff --git a/src/libstd/num/uint_macros.rs b/src/libstd/num/uint_macros.rs
diff --git a/src/libstd/os.rs b/src/libstd/os.rs
diff --git a/src/libstd/str.rs b/src/libstd/str.rs

Original file line number	Diff line number	Diff line change
`@@ -1197,7 +1197,7 @@ mod tests {`
`1197`	`1197`	`#[test]`
`1198`	`1198`	`fn test_from_bytes() {`
`1199`	`1199`	`let bitv = from_bytes([0b10110110, 0b00000000, 0b11111111]);`
`1200`		`- let str = ~"10110110" + ~"00000000" + ~"11111111";`
	`1200`	`+ let str = ~"10110110" + "00000000" + "11111111";`
`1201`	`1201`	`assert_eq!(bitv.to_str(), str);`
`1202`	`1202`	`}`
`1203`	`1203`