Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix some warnings in servo/lib.rs.

Browse source
This commit is contained in:
Ms2ger 2015-02-12 18:39:14 +01:00
parent 7896679afe
commit 31f6595981
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/servo/lib.rs
View file

@ -2,10 +2,9 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#![feature(thread_local)] #![feature(core, env, libc, path, rustc_private, std_misc, thread_local)]
#![allow(missing_copy_implementations)] #![allow(missing_copy_implementations)]
#![allow(unstable)]
#[macro_use] #[macro_use]
extern crate log; extern crate log;
@ -51,8 +50,6 @@ use util::opts;
#[cfg(not(test))] #[cfg(not(test))]
use util::taskpool::TaskPool; use util::taskpool::TaskPool;
#[cfg(not(test))]
use std::os;
#[cfg(not(test))] #[cfg(not(test))]
use std::rc::Rc; use std::rc::Rc;
#[cfg(not(test))] #[cfg(not(test))]
@ -67,6 +64,8 @@ pub struct Browser<Window> {
impl<Window> Browser<Window> where Window: WindowMethods + 'static { impl<Window> Browser<Window> where Window: WindowMethods + 'static {
#[cfg(not(test))] #[cfg(not(test))]
pub fn new(window: Option<Rc<Window>>) -> Browser<Window> { pub fn new(window: Option<Rc<Window>>) -> Browser<Window> {
use std::env;
::util::opts::set_experimental_enabled(opts::get().enable_experimental); ::util::opts::set_experimental_enabled(opts::get().enable_experimental);
let opts = opts::get(); let opts = opts::get();
RegisterBindings::RegisterProxyHandlers(); RegisterBindings::RegisterProxyHandlers();
@ -112,12 +111,12 @@ impl<Window> Browser<Window> where Window: WindowMethods + 'static {
storage_task); storage_task);
// Send the URL command to the constellation. // Send the URL command to the constellation.
let cwd = os::getcwd().unwrap(); let cwd = env::current_dir().unwrap();
for url in opts.urls.iter() { for url in opts.urls.iter() {
let url = match url::Url::parse(url.as_slice()) { let url = match url::Url::parse(&*url) {
Ok(url) => url, Ok(url) => url,
Err(url::ParseError::RelativeUrlWithoutBase) Err(url::ParseError::RelativeUrlWithoutBase)
=> url::Url::from_file_path(&cwd.join(url.as_slice())).unwrap(), => url::Url::from_file_path(&cwd.join(&*url)).unwrap(),
Err(_) => panic!("URL parsing failed"), Err(_) => panic!("URL parsing failed"),
}; };