Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 10:15:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1487993: webdriver: avoid explicitly calling iteration protocols; r=whimboo

Browse Source 
Instead of making explicit calls to iterator protocol methods such as
x.iter() or x.into_iter(), we can loop over references to collections.
This is considered better style.
This commit is contained in:
Andreas Tolfsen 2018-09-01 14:59:04 +01:00
parent de10473139
commit ec4e9c209f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
testing/webdriver/src/capabilities.rs
View File

@ -121,7 +121,7 @@ impl SpecNewSessionParameters {
capabilities.remove(&key);
}
for (key, value) in capabilities.iter() {
for (key, value) in &capabilities {
match &**key {
x @ "acceptInsecureCerts" | x @ "setWindowRect" => if !value.is_boolean() {
return Err(WebDriverError::new(
@ -189,7 +189,7 @@ impl SpecNewSessionParameters {
"proxy is not an object"
);
for (key, value) in obj.iter() {
for (key, value) in obj {
match &**key {
"proxyType" => match value.as_str() {
Some("pac") | Some("direct") | Some("autodetect") | Some("system")
@ -326,7 +326,7 @@ impl SpecNewSessionParameters {
"timeouts capability is not an object"
);
for (key, value) in obj.iter() {
for (key, value) in obj {
match &**key {
x @ "script" | x @ "pageLoad" | x @ "implicit" => {
let timeout = try_opt!(
@ -412,7 +412,7 @@ impl CapabilitiesMatching for SpecNewSessionParameters {
));
}
let mut merged = self.alwaysMatch.clone();
for (key, value) in first_match_entry.clone().into_iter() {
for (key, value) in first_match_entry.clone() {
merged.insert(key, value);
}
Ok(merged)
@ -425,7 +425,7 @@ impl CapabilitiesMatching for SpecNewSessionParameters {
.filter_map(|merged| {
browser_capabilities.init(merged);
for (key, value) in merged.iter() {
for (key, value) in merged {
match &**key {
"browserName" => {
let browserValue = browser_capabilities

6
testing/webdriver/src/httpapi.rs
View File

@ -359,10 +359,10 @@ impl<U: WebDriverExtensionRoute> WebDriverHttpApi<U> {
pub fn new(extension_routes: &[(Method, &str, U)]) -> WebDriverHttpApi<U> {
let mut rv = WebDriverHttpApi::<U> { routes: vec![] };
debug!("Creating routes");
for &(ref method, ref url, ref match_type) in standard_routes::<U>().iter() {
for &(ref method, ref url, ref match_type) in &standard_routes::<U>() {
rv.add(method.clone(), *url, (*match_type).clone());
}
for &(ref method, ref url, ref extension_route) in extension_routes.iter() {
for &(ref method, ref url, ref extension_route) in extension_routes {
rv.add(
method.clone(),
*url,
@ -384,7 +384,7 @@ impl<U: WebDriverExtensionRoute> WebDriverHttpApi<U> {
body: &str,
) -> WebDriverResult<WebDriverMessage<U>> {
let mut error = ErrorStatus::UnknownPath;
for &(ref match_method, ref matcher) in self.routes.iter() {
for &(ref match_method, ref matcher) in &self.routes {
if method == *match_method {
let (method_match, captures) = matcher.get_match(method, path);
if captures.is_some() {