Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use iter.next instead of for-break.

Browse source
This commit is contained in:
krk 2019-04-16 22:24:20 +02:00
parent 32049d1ab6
commit 6db7518110
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script_plugins/webidl_must_inherit.rs
View file

@ -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)?; let path = get_webidl_path(&name)?;
if let Some(parent) = parent_name { if let Some(parent) = parent_name {
let code = fs::read_to_string(path)?; let code = fs::read_to_string(path)?;
return check_inherits(&code, &name, parent); return check_inherits(&code, name, &parent);
} }
Ok(()) 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)), .expect_item_by_hir_id(cx.tcx.hir().get_parent_item(id)),
}; };
let ty: String; let parent_name = def.fields().iter().next().map(|field| {
let mut parent_name: Option<&str> = None;
for ref field in def.fields() {
let def_id = cx.tcx.hir().local_def_id_from_hir_id(field.hir_id); 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 ty = cx.tcx.type_of(def_id).to_string();
let name = get_ty_name(&ty); get_ty_name(&ty).to_string()
parent_name = Some(name); });
// Only first field is relevant.
break;
}
let struct_name = n.to_string(); let struct_name = n.to_string();
match check_webidl(&struct_name, parent_name) { match check_webidl(&struct_name, &parent_name) {
Ok(()) => {}, Ok(()) => {},
Err(e) => { Err(e) => {
let description = format!("{}", e); let description = format!("{}", e);