diff --git a/deps/rust-crypto b/deps/rust-crypto
index 942e60ec3..314d87895 160000
--- a/deps/rust-crypto
+++ b/deps/rust-crypto
@@ -1 +1 @@
-Subproject commit 942e60ec3281ee83b6dc1fdcf7a71d21436bcda9
+Subproject commit 314d87895b6f41261b17e6302c13f1cb2fdf8809
diff --git a/src/common/time.rs b/src/common/time.rs
index 77c659e92..417598ef6 100644
--- a/src/common/time.rs
+++ b/src/common/time.rs
@@ -28,7 +28,7 @@ pub fn from_str(string: &str) -> Result<f64, String> {
             }
         }
     };
-    match ::std::from_str::from_str::<f64>(numstr) {
+    match ::std::str::from_str::<f64>(numstr) {
         Some(m) => Ok(m * times as f64),
         None => Err(format!("invalid time interval '{}'", string))
     }
diff --git a/src/cut/ranges.rs b/src/cut/ranges.rs
index 43f4c8373..8a3ef2b2c 100644
--- a/src/cut/ranges.rs
+++ b/src/cut/ranges.rs
@@ -15,7 +15,7 @@ pub struct Range {
     pub high: uint,
 }
 
-impl std::from_str::FromStr for Range {
+impl std::str::FromStr for Range {
     fn from_str(s: &str) -> Option<Range> {
         use std::uint::MAX;
 
diff --git a/src/expand/expand.rs b/src/expand/expand.rs
index 211adc580..08f48c1a1 100644
--- a/src/expand/expand.rs
+++ b/src/expand/expand.rs
@@ -15,7 +15,7 @@ extern crate getopts;
 extern crate libc;
 
 use std::io;
-use std::from_str;
+use std::str::from_str;
 
 #[path = "../common/util.rs"]
 mod util;
@@ -29,7 +29,7 @@ fn tabstops_parse(s: String) -> Vec<uint> {
     let words = s.as_slice().split(',').collect::<Vec<&str>>();
 
     let nums = words.into_iter()
-        .map(|sn| from_str::from_str::<uint>(sn)
+        .map(|sn| from_str::<uint>(sn)
             .unwrap_or_else(
                 || crash!(1, "{}\n", "tab size contains invalid character(s)"))
             )
diff --git a/src/kill/kill.rs b/src/kill/kill.rs
index daec1c6b7..3ae044749 100644
--- a/src/kill/kill.rs
+++ b/src/kill/kill.rs
@@ -19,7 +19,7 @@ extern crate serialize;
 
 #[phase(plugin, link)] extern crate log;
 
-use std::from_str::from_str;
+use std::str::from_str;
 use std::io::process::Process;
 
 use getopts::{
diff --git a/src/shuf/shuf.rs b/src/shuf/shuf.rs
index 7441e0b32..a6fea71cd 100644
--- a/src/shuf/shuf.rs
+++ b/src/shuf/shuf.rs
@@ -15,7 +15,7 @@ extern crate getopts;
 extern crate libc;
 
 use std::cmp;
-use std::from_str::from_str;
+use std::str::from_str;
 use std::io;
 use std::io::IoResult;
 use std::iter::{range_inclusive, RangeInclusive};
diff --git a/src/unexpand/unexpand.rs b/src/unexpand/unexpand.rs
index f6c20bf5c..f37ccf2b6 100644
--- a/src/unexpand/unexpand.rs
+++ b/src/unexpand/unexpand.rs
@@ -15,7 +15,7 @@ extern crate getopts;
 extern crate libc;
 
 use std::io;
-use std::from_str;
+use std::str::from_str;
 
 #[path = "../common/util.rs"]
 mod util;
@@ -29,7 +29,7 @@ fn tabstops_parse(s: String) -> Vec<uint> {
     let words = s.as_slice().split(',').collect::<Vec<&str>>();
 
     let nums = words.into_iter()
-        .map(|sn| from_str::from_str::<uint>(sn)
+        .map(|sn| from_str::<uint>(sn)
             .unwrap_or_else(
                 || crash!(1, "{}\n", "tab size contains invalid character(s)"))
             )
diff --git a/src/uniq/uniq.rs b/src/uniq/uniq.rs
index e80ada2b7..c029d606b 100644
--- a/src/uniq/uniq.rs
+++ b/src/uniq/uniq.rs
@@ -15,7 +15,7 @@ extern crate getopts;
 
 use std::ascii::OwnedAsciiExt;
 use std::cmp::min;
-use std::from_str::FromStr;
+use std::str::FromStr;
 use std::io;
 
 #[path = "../common/util.rs"]
diff --git a/src/uptime/uptime.rs b/src/uptime/uptime.rs
index d310ed5c3..593dbad25 100644
--- a/src/uptime/uptime.rs
+++ b/src/uptime/uptime.rs
@@ -20,7 +20,7 @@ extern crate libc;
 use std::mem::transmute;
 use std::io::{print, File};
 use std::ptr::{null_mut, null};
-use std::from_str::from_str;
+use std::str::from_str;
 use libc::{time_t, c_double, c_int, c_char};
 use c_types::c_tm;
 use utmpx::*;