diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2015-08-27 01:22:42 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2015-08-27 16:59:02 +0200 |
commit | c831c2c0a528b6a04b355cc51169023f8c29b761 (patch) | |
tree | d443f7075709bdb222163aecc8ce1c3b81e107b9 /components/script/dom/performancetiming.rs | |
parent | 1384ff5e9f4d98630d4ec1206049c8fb6d96f187 (diff) | |
download | servo-c831c2c0a528b6a04b355cc51169023f8c29b761.tar.gz servo-c831c2c0a528b6a04b355cc51169023f8c29b761.zip |
Remove helper traits
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.
Diffstat (limited to 'components/script/dom/performancetiming.rs')
-rw-r--r-- | components/script/dom/performancetiming.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/components/script/dom/performancetiming.rs b/components/script/dom/performancetiming.rs index 1bb6eb4aa65..4d453dcb4bb 100644 --- a/components/script/dom/performancetiming.rs +++ b/components/script/dom/performancetiming.rs @@ -46,12 +46,9 @@ impl<'a> PerformanceTimingMethods for &'a PerformanceTiming { } } -pub trait PerformanceTimingHelpers { - fn NavigationStartPrecise(self) -> f64; -} -impl<'a> PerformanceTimingHelpers for &'a PerformanceTiming { - fn NavigationStartPrecise(self) -> f64 { +impl PerformanceTiming { + pub fn NavigationStartPrecise(&self) -> f64 { self.navigationStartPrecise } } |