forked from mirrors/gecko-dev
38405ee47e
This fixes about 130 clippy lints. Let me know if i should split up the commit. I wasn't sure about some of the changes, especially map_or instead of map(...).unwrap_or(...) and if let instead of single arm match were not always a strict improvement in my opinion, but i'll leave that decision to the reviewer :) There are about 150 lints left which i thought were clippy bugs or i didn't know how to fix. cc @Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: 9da739acefc7d1776bf727c8bf782eb79f241028
51 lines
1.8 KiB
Rust
51 lines
1.8 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
|
|
use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::js::{RootedReference};
|
|
use dom::htmlheadelement::HTMLHeadElement;
|
|
use dom::node::Node;
|
|
use std::borrow::ToOwned;
|
|
use std::fs::read_dir;
|
|
use std::path::PathBuf;
|
|
use util::opts;
|
|
use util::resource_files::resources_dir_path;
|
|
use util::str::DOMString;
|
|
|
|
|
|
pub fn load_script(head: &HTMLHeadElement) {
|
|
if let Some(ref path_str) = opts::get().userscripts {
|
|
let node = head.upcast::<Node>();
|
|
let first_child = node.GetFirstChild();
|
|
let doc = node.owner_doc();
|
|
let doc = doc.r();
|
|
|
|
let path = if &**path_str == "" {
|
|
let mut p = resources_dir_path();
|
|
p.push("user-agent-js");
|
|
p
|
|
} else {
|
|
PathBuf::from(path_str)
|
|
};
|
|
|
|
let mut files = read_dir(&path).expect("Bad path passed to --userscripts")
|
|
.filter_map(|e| e.ok())
|
|
.map(|e| e.path()).collect::<Vec<_>>();
|
|
|
|
files.sort();
|
|
|
|
for file in files {
|
|
let name = match file.into_os_string().into_string() {
|
|
Ok(ref s) if s.ends_with(".js") => "file://".to_owned() + &s[..],
|
|
_ => continue
|
|
};
|
|
let new_script = doc.CreateElement(DOMString::from("script")).unwrap();
|
|
let new_script = new_script.r();
|
|
new_script.set_string_attribute(&atom!("src"), DOMString::from(name));
|
|
node.InsertBefore(new_script.upcast(), first_child.r()).unwrap();
|
|
}
|
|
}
|
|
}
|