diff options
author | Jack Moffitt <jack@metajack.im> | 2014-06-01 00:21:53 -0600 |
---|---|---|
committer | Jack Moffitt <jack@metajack.im> | 2014-06-05 09:58:59 -0600 |
commit | 629c4c6afe7cea86c051bb9f52adeac716e2c43f (patch) | |
tree | ee84d9a9b37ecd37e0a9606509624e7f728f5a81 /src/components/main/servo.rs | |
parent | 2ae671b5aa9d27812adcdb8ebc749733156df66e (diff) | |
download | servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.tar.gz servo-629c4c6afe7cea86c051bb9f52adeac716e2c43f.zip |
Upgrade Rust.
Diffstat (limited to 'src/components/main/servo.rs')
-rw-r--r-- | src/components/main/servo.rs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/components/main/servo.rs b/src/components/main/servo.rs index 14912a7e179..543244de0ba 100644 --- a/src/components/main/servo.rs +++ b/src/components/main/servo.rs @@ -11,6 +11,8 @@ #[phase(syntax, link)] extern crate log; +extern crate debug; + extern crate alert; extern crate azure; extern crate geom; @@ -131,7 +133,7 @@ pub mod platform; #[allow(dead_code)] fn start(argc: int, argv: **u8) -> int { native::start(argc, argv, proc() { - opts::from_cmdline_args(os::args()).map(run); + opts::from_cmdline_args(os::args().as_slice()).map(run); }) } @@ -192,13 +194,13 @@ pub fn run(opts: opts::Opts) { // Send the URL command to the constellation. for filename in opts.urls.iter() { - let url = if filename.starts_with("data:") { + let url = if filename.as_slice().starts_with("data:") { // As a hack for easier command-line testing, // assume that data URLs are not URL-encoded. - Url::new("data".to_owned(), None, "".to_owned(), None, - filename.slice_from(5).to_owned(), vec!(), None) + Url::new("data".to_string(), None, "".to_string(), None, + filename.as_slice().slice_from(5).to_string(), vec!(), None) } else { - parse_url(*filename, None) + parse_url(filename.as_slice(), None) }; let ConstellationChan(ref chan) = constellation_chan; |