fix tests, remove some warnings

Author: huonw

doc/rust.md

@@ -802,15 +802,15 @@ Use declarations support a number of convenient shortcuts:
 An example of `use` declarations:
 
 ~~~~
-use std::float::{sin, pow};
-use std::option::Some;
+use std::float::sin;
+use std::option::{Some, None};
 
 fn main() {
-    // Equivalent to 'info!(std::float::pow(std::float::sin(1.0), 2.0));'
-    info!(pow(sin(1.0), 2.0));
+    // Equivalent to 'info!(std::float::sin(1.0));'
+    info!(sin(1.0));
 
-    // Equivalent to 'info!(std::option::Some(1.0));'
-    info!(Some(1.0));
+    // Equivalent to 'info!(~[std::option::Some(1.0), std::option::None]);'
+    info!(~[Some(1.0), None]);
 }
 ~~~~
 

src/compiletest/errors.rs

@@ -11,7 +11,6 @@
 use core::prelude::*;
 
 use core::io;
-use core::str;
 
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 

src/compiletest/header.rs

@@ -16,7 +16,6 @@ use common;
 use core::iterator::IteratorUtil;
 use core::io;
 use core::os;
-use core::str;
 
 pub struct TestProps {
     // Lines that should be expected, in order, on standard out

src/libextra/net_url.rs

@@ -19,7 +19,6 @@ use core::cmp::Eq;
 use core::io::{Reader, ReaderUtil};
 use core::io;
 use core::hashmap::HashMap;
-use core::str;
 use core::to_bytes;
 use core::uint;
 
@@ -394,7 +393,7 @@ enum Input {
 // returns userinfo, host, port, and unparsed part, or an error
 fn get_authority(rawurl: &str) ->
     Result<(Option<UserInfo>, ~str, Option<~str>, ~str), ~str> {
-    if !raw_url.starts_with("//") {
+    if !rawurl.starts_with("//") {
         // there is no authority.
         return Ok((None, ~"", None, rawurl.to_str()));
     }

src/libextra/rope.rs

@@ -40,6 +40,7 @@ use core::prelude::*;
 use core::iterator::IteratorUtil;
 use core::uint;
 use core::vec;
+use core::str;
 
 /// The type of ropes.
 pub type Rope = node::Root;
@@ -1187,8 +1188,6 @@ pub mod node {
     pub mod char_iterator {
         use core::prelude::*;
 
-        use core::str;
-
         use rope::node::{Leaf, Node};
         use rope::node::leaf_iterator;
 

src/libextra/semver.rs

@@ -20,7 +20,6 @@ use core::cmp;
 use core::io::{ReaderUtil};
 use core::io;
 use core::option::{Option, Some, None};
-use core::str;
 use core::to_str::ToStr;
 use core::uint;
 

src/libfuzzer/fuzzer.rc

@@ -37,7 +37,6 @@ use std::result;
 use std::run;
 use std::str;
 use std::uint;
-use std::vec;
 
 use syntax::diagnostic;
 use syntax::parse::token::ident_interner;

src/librustc/middle/trans/base.rs

@@ -1995,7 +1995,7 @@ pub fn trans_enum_variant(ccx: @CrateContext,
 
     debug!("trans_enum_variant: name=%s tps=%s repr=%? enum_ty=%s",
            unsafe { str::raw::from_c_str(llvm::LLVMGetValueName(llfndecl)) },
-           ~"[" + ty_param_substs.map(|&t| ty_to_str(ccx.tcx.connect(t)), ", ") + "]",
+           ~"[" + ty_param_substs.map(|&t| ty_to_str(ccx.tcx, t)).connect(", ") + "]",
            repr, ty_to_str(ccx.tcx, enum_ty));
 
     adt::trans_start_init(bcx, repr, fcx.llretptr.get(), disr);

src/librustc/middle/trans/build.rs

@@ -192,9 +192,7 @@ pub fn Invoke(cx: block,
     terminate(cx, "Invoke");
     debug!("Invoke(%s with arguments (%s))",
            val_str(cx.ccx().tn, Fn),
-           vec::map(Args.connect(|a| val_str(cx.ccx().tn,
-                                                   *a).to_owned()),
-                        ", "));
+           Args.map(|a| val_str(cx.ccx().tn, *a).to_owned()).connect(", "));
     unsafe {
         count_insn(cx, "invoke");
         llvm::LLVMBuildInvoke(B(cx),

src/librustc/middle/typeck/check/mod.rs

@@ -115,7 +115,6 @@ use core::iterator::IteratorUtil;
 use core::cast::transmute;
 use core::hashmap::HashMap;
 use core::result;
-use core::str;
 use core::util::replace;
 use core::vec;
 use extra::list::Nil;