aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib.rs
diff options
context:
space:
mode:
authorKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
committerKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
commit045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch)
tree1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /src/lib.rs
parentd6ba37c68c34a3748a789caeca225083275757e5 (diff)
parenta40b94d7f946d75e1a66af206efda9879b89c707 (diff)
downloadservo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz
servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'src/lib.rs')
-rw-r--r--src/lib.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 8a8fb3217e8..6434f0c364c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -17,10 +17,10 @@ extern crate debug;
extern crate compositing;
extern crate devtools;
extern crate rustuv;
-extern crate servo_net = "net";
-extern crate servo_msg = "msg";
+extern crate "net" as servo_net;
+extern crate "msg" as servo_msg;
#[phase(plugin, link)]
-extern crate servo_util = "util";
+extern crate "util" as servo_util;
extern crate script;
extern crate layout;
extern crate green;
@@ -132,11 +132,11 @@ pub fn run(opts: opts::Opts) {
// Send the URL command to the constellation.
let cwd = os::getcwd();
- for &url in opts.urls.iter() {
+ for url in opts.urls.iter() {
let url = match url::Url::parse(url.as_slice()) {
Ok(url) => url,
Err(url::RelativeUrlWithoutBase)
- => url::Url::from_file_path(&cwd.join(url)).unwrap(),
+ => url::Url::from_file_path(&cwd.join(url.as_slice())).unwrap(),
Err(_) => fail!("URL parsing failed"),
};