mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove needless special cases and dead code

Browse Source
This commit is contained in:
Oli Scherer 2022-10-21 08:27:39 +00:00
parent 0940040c04
commit 349ba6bb51
1 changed files with 3 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
compiler/rustc_ast_passes/src/ast_validation.rs
View File

@ -251,20 +251,6 @@ fn walk_ty(&mut self, t: &'a Ty) {
} }
} }
fn visit_struct_field_def(&mut self, field: &'a FieldDef) {
if let Some(ident) = field.ident {
if ident.name == kw::Underscore {
self.visit_vis(&field.vis);
self.visit_ident(ident);
self.visit_ty_common(&field.ty);
self.walk_ty(&field.ty);
walk_list!(self, visit_attribute, &field.attrs);
return;
}
}
self.visit_field_def(field);
}
fn err_handler(&self) -> &rustc_errors::Handler { fn err_handler(&self) -> &rustc_errors::Handler {
&self.session.diagnostic() &self.session.diagnostic()
} }
@ -1005,8 +991,8 @@ fn visit_lifetime(&mut self, lifetime: &'a Lifetime, _: visit::LifetimeCtxt) {
visit::walk_lifetime(self, lifetime); visit::walk_lifetime(self, lifetime);
} }
fn visit_field_def(&mut self, s: &'a FieldDef) { fn visit_field_def(&mut self, field: &'a FieldDef) {
visit::walk_field_def(self, s) visit::walk_field_def(self, field)
} }
fn visit_item(&mut self, item: &'a Item) { fn visit_item(&mut self, item: &'a Item) {
@ -1194,42 +1180,10 @@ fn visit_item(&mut self, item: &'a Item) {
self.check_mod_file_item_asciionly(item.ident); self.check_mod_file_item_asciionly(item.ident);
} }
} }
ItemKind::Struct(ref vdata, ref generics) => match vdata { ItemKind::Union(ref vdata, ..) => {
// Duplicating the `Visitor` logic allows catching all cases
// of `Anonymous(Struct, Union)` outside of a field struct or union.
//
// Inside `visit_ty` the validator catches every `Anonymous(Struct, Union)` it
// encounters, and only on `ItemKind::Struct` and `ItemKind::Union`
// it uses `visit_ty_common`, which doesn't contain that specific check.
VariantData::Struct(ref fields, ..) => {
self.visit_vis(&item.vis);
self.visit_ident(item.ident);
self.visit_generics(generics);
self.with_banned_assoc_ty_bound(|this| {
walk_list!(this, visit_struct_field_def, fields);
});
walk_list!(self, visit_attribute, &item.attrs);
return;
}
_ => {}
},
ItemKind::Union(ref vdata, ref generics) => {
if vdata.fields().is_empty() { if vdata.fields().is_empty() {
self.err_handler().span_err(item.span, "unions cannot have zero fields"); self.err_handler().span_err(item.span, "unions cannot have zero fields");
} }
match vdata {
VariantData::Struct(ref fields, ..) => {
self.visit_vis(&item.vis);
self.visit_ident(item.ident);
self.visit_generics(generics);
self.with_banned_assoc_ty_bound(|this| {
walk_list!(this, visit_struct_field_def, fields);
});
walk_list!(self, visit_attribute, &item.attrs);
return;
}
_ => {}
}
} }
ItemKind::Const(def, .., None) => { ItemKind::Const(def, .., None) => {
self.check_defaultness(item.span, def); self.check_defaultness(item.span, def);