Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename typ to ty and use &str where possible.

Browse source
This commit is contained in:
krk 2019-04-16 21:17:38 +02:00
parent 3878fe86e7
commit 2384e5f4a2
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/script_plugins/webidl_must_inherit.rs
View file

@ -65,11 +65,11 @@ impl WebIdlPass {
} }
} }
fn get_typ_name(typ: String) -> String { fn get_ty_name(ty: &str) -> &str {
if let Some(i) = typ.rfind(':') { if let Some(i) = ty.rfind(':') {
typ[i + 1..].to_string() &ty[i + 1..]
} else { } else {
typ ty
} }
} }
@ -118,13 +118,13 @@ fn check_inherits(code: &str, name: &str, parent_name: &str) -> Result<(), Box<E
})) }))
} }
fn check_webidl(name: &str, parent_name: Option<String>) -> Result<(), Box<Error>> { fn check_webidl(name: &str, parent_name: Option<&str>) -> Result<(), Box<Error>> {
let path = get_webidl_path(&name)?; let path = get_webidl_path(&name)?;
println!("struct_webidl_path: {:?}", &path); println!("struct_webidl_path: {:?}", &path);
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(())
@ -165,18 +165,19 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for WebIdlPass {
let struct_name = n.to_string(); let struct_name = n.to_string();
println!("struct_name: {:?}", struct_name); println!("struct_name: {:?}", struct_name);
let mut parent_typ_name: Option<String> = None; let ty: String;
let mut parent_name: Option<&str> = None;
for ref field in def.fields() { 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);
let ty = cx.tcx.type_of(def_id); ty = cx.tcx.type_of(def_id).to_string();
let typ_name = get_typ_name(ty.to_string()); let name = get_ty_name(&ty);
parent_typ_name = Some(typ_name); parent_name = Some(name);
// Only first field is relevant. // Only first field is relevant.
break; break;
} }
match check_webidl(&struct_name, parent_typ_name) { match check_webidl(&struct_name, parent_name) {
Ok(()) => {}, Ok(()) => {},
Err(e) => { Err(e) => {
let description = format!("{}", e); let description = format!("{}", e);