servo: Merge #3438 - Upgrade Rust (from servo:rustup)

Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c

servo/components/script_traits/lib.rs

@@ -9,10 +9,9 @@
 
 extern crate devtools_traits;
 extern crate geom;
-extern crate servo_msg = "msg";
-extern crate servo_net = "net";
+extern crate "msg" as servo_msg;
+extern crate "net" as servo_net;
 extern crate url;
-extern crate std;
 extern crate serialize;
 
 // This module contains traits in script used generically