aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkrk <keremkat@gmail.com>2019-04-16 22:24:20 +0200
committerkrk <keremkat@gmail.com>2019-04-20 22:39:38 +0200
commit6db7518110e9a69da7329a8cdcc560f969a549a2 (patch)
tree8589962e4c613642c5d8e203d6b6d86365198746
parent32049d1ab6e64103b39490498061e81231492437 (diff)
downloadservo-6db7518110e9a69da7329a8cdcc560f969a549a2.tar.gz
servo-6db7518110e9a69da7329a8cdcc560f969a549a2.zip
Use iter.next instead of for-break.
-rw-r--r--components/script_plugins/webidl_must_inherit.rs20
1 files changed, 7 insertions, 13 deletions
diff --git a/components/script_plugins/webidl_must_inherit.rs b/components/script_plugins/webidl_must_inherit.rs
index 43453766176..4b4a79089c9 100644
--- a/components/script_plugins/webidl_must_inherit.rs
+++ b/components/script_plugins/webidl_must_inherit.rs
@@ -133,11 +133,11 @@ fn check_inherits(code: &str, name: &str, parent_name: &str) -> Result<(), Box<E
}))
}
-fn check_webidl(name: &str, parent_name: Option<&str>) -> Result<(), Box<Error>> {
+fn check_webidl(name: &str, parent_name: &Option<String>) -> Result<(), Box<Error>> {
let path = get_webidl_path(&name)?;
if let Some(parent) = parent_name {
let code = fs::read_to_string(path)?;
- return check_inherits(&code, &name, parent);
+ return check_inherits(&code, name, &parent);
}
Ok(())
@@ -175,20 +175,14 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
.expect_item_by_hir_id(cx.tcx.hir().get_parent_item(id)),
};
- let ty: String;
- let mut parent_name: Option<&str> = None;
- for ref field in def.fields() {
+ let parent_name = def.fields().iter().next().map(|field| {
let def_id = cx.tcx.hir().local_def_id_from_hir_id(field.hir_id);
- ty = cx.tcx.type_of(def_id).to_string();
- let name = get_ty_name(&ty);
- parent_name = Some(name);
-
- // Only first field is relevant.
- break;
- }
+ let ty = cx.tcx.type_of(def_id).to_string();
+ get_ty_name(&ty).to_string()
+ });
let struct_name = n.to_string();
- match check_webidl(&struct_name, parent_name) {
+ match check_webidl(&struct_name, &parent_name) {
Ok(()) => {},
Err(e) => {
let description = format!("{}", e);