mirror of
https://github.com/servo/servo.git
synced 2025-07-31 19:20:22 +01:00
c831c2c0a5
Now that JSRef<T> is gone, there is no need to have helper traits.
On components/script/*.rs:
# Remove imports.
/^ *use dom::[a-z]+::\{.*Helpers/ {
s/\{(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers, /\{/
s/, (Raw[^L]|[^L][^a])[a-zA-Z]+Helpers([,}])/\2/g
s/\{([a-zA-Z]+)\}/\1/
/\{\}/d
s/::self;$/;/
}
/^ *use dom::[a-z]+::\{?(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers\}?;$/d
On components/script/dom/*.rs:
# Ignore layout things.
/^(pub )?(impl|trait).*Layout.* \{/,/^}$/ { P; D; }
# Delete helpers traits.
/^(pub )?trait ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? \{$/,/^\}$/D
# Patch private helpers.
/^impl.*Private.*Helpers/,/^\}$/ {
s/^impl<'a> Private([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for &'a ([^ ]+) \{$/impl \3 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
# Patch public helpers.
/^impl.*Helpers/,/^\}$/ {
s/^impl(<'a>)? ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for (&'a )?([^ ]+) \{$/impl \5 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn .*\(&?self[,)]/s/(unsafe )?fn/pub &/
/^ *pub (unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
The few error cases were then fixed by hand.
51 lines
1.9 KiB
Rust
51 lines
1.9 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::codegen::InheritTypes::NodeCast;
|
|
use dom::bindings::js::{RootedReference};
|
|
use dom::element::AttributeHandlers;
|
|
use dom::htmlheadelement::HTMLHeadElement;
|
|
use std::borrow::ToOwned;
|
|
use std::fs::read_dir;
|
|
use std::path::PathBuf;
|
|
use util::opts;
|
|
use util::resource_files::resources_dir_path;
|
|
|
|
|
|
pub fn load_script(head: &HTMLHeadElement) {
|
|
if let Some(ref path_str) = opts::get().userscripts {
|
|
let node = NodeCast::from_ref(head);
|
|
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).ok().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("script".to_owned()).unwrap();
|
|
let new_script = new_script.r();
|
|
new_script.set_string_attribute(&atom!("src"), name);
|
|
let new_script_node = NodeCast::from_ref(new_script);
|
|
node.InsertBefore(new_script_node, first_child.r()).unwrap();
|
|
}
|
|
}
|
|
}
|