Skip to content

Commit

Permalink
Remove unused functions calls and unused E0406
Browse files Browse the repository at this point in the history
  • Loading branch information
GuillaumeGomez committed Jun 18, 2016
1 parent 646015c commit 8637b4b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 33 deletions.
2 changes: 1 addition & 1 deletion src/librustc_resolve/diagnostics.rs
Expand Up @@ -1105,7 +1105,7 @@ register_diagnostics! {
// E0257,
// E0258,
E0402, // cannot use an outer type parameter in this context
E0406, // undeclared associated type
// E0406, merged into 420
// E0410, merged into 408
// E0413, merged into 530
// E0414, merged into 530
Expand Down
32 changes: 0 additions & 32 deletions src/librustc_resolve/lib.rs
Expand Up @@ -104,8 +104,6 @@ enum ResolutionError<'a> {
IsNotATrait(&'a str),
/// error E0405: use of undeclared trait name
UndeclaredTraitName(&'a str, SuggestedCandidates),
/// error E0406: undeclared associated type
UndeclaredAssociatedType,
/// error E0407: method is not a member of trait
MethodNotMemberOfTrait(Name, &'a str),
/// error E0437: type is not a member of trait
Expand Down Expand Up @@ -229,9 +227,6 @@ fn resolve_struct_error<'b, 'a: 'b, 'c>(resolver: &'b Resolver<'a>,
err.span_label(span, &format!("`{}` is not in scope", name));
err
}
ResolutionError::UndeclaredAssociatedType => {
struct_span_err!(resolver.session, span, E0406, "undeclared associated type")
}
ResolutionError::MethodNotMemberOfTrait(method, trait_) => {
struct_span_err!(resolver.session,
span,
Expand Down Expand Up @@ -519,9 +514,6 @@ impl<'a, 'v> Visitor<'v> for Resolver<'a> {
fn visit_ty(&mut self, ty: &Ty) {
self.resolve_type(ty);
}
fn visit_generics(&mut self, generics: &Generics) {
self.resolve_generics(generics);
}
fn visit_poly_trait_ref(&mut self, tref: &ast::PolyTraitRef, m: &ast::TraitBoundModifier) {
match self.resolve_trait_reference(tref.trait_ref.ref_id, &tref.trait_ref.path, 0) {
Ok(def) => self.record_def(tref.trait_ref.ref_id, def),
Expand Down Expand Up @@ -1850,30 +1842,6 @@ impl<'a> Resolver<'a> {
})
}

fn resolve_generics(&mut self, generics: &Generics) {
for predicate in &generics.where_clause.predicates {
match predicate {
&ast::WherePredicate::BoundPredicate(_) |
&ast::WherePredicate::RegionPredicate(_) => {}
&ast::WherePredicate::EqPredicate(ref eq_pred) => {
self.resolve_path(eq_pred.id, &eq_pred.path, 0, TypeNS).and_then(|path_res| {
if let PathResolution { base_def: Def::TyParam(..), .. } = path_res {
Ok(self.record_def(eq_pred.id, path_res))
} else {
Err(false)
}
}).map_err(|error_reported| {
self.record_def(eq_pred.id, err_path_resolution());
if error_reported { return }
let error_variant = ResolutionError::UndeclaredAssociatedType;
resolve_error(self, eq_pred.span, error_variant);
}).unwrap_or(());
}
}
}
visit::walk_generics(self, generics);
}

fn with_current_self_type<T, F>(&mut self, self_type: &Ty, f: F) -> T
where F: FnOnce(&mut Resolver) -> T
{
Expand Down

0 comments on commit 8637b4b

Please sign in to comment.