Fixed more imports and variable names.

This commit is contained in:
Alexander Regueiro 2018-12-07 02:39:33 +00:00
parent 99c7130b09
commit f81b8cfd8d
2 changed files with 4 additions and 5 deletions

View file

@ -20,7 +20,7 @@ use hir::HirVec;
use lint; use lint;
use middle::resolve_lifetime as rl; use middle::resolve_lifetime as rl;
use namespace::Namespace; use namespace::Namespace;
use rustc::traits::{self, TraitRefExpansionInfoDignosticBuilder}; use rustc::traits;
use rustc::ty::{self, Ty, TyCtxt, ToPredicate, TypeFoldable}; use rustc::ty::{self, Ty, TyCtxt, ToPredicate, TypeFoldable};
use rustc::ty::{GenericParamDef, GenericParamDefKind}; use rustc::ty::{GenericParamDef, GenericParamDefKind};
use rustc::ty::subst::{Kind, Subst, Substs}; use rustc::ty::subst::{Kind, Subst, Substs};
@ -39,7 +39,6 @@ use util::nodemap::FxHashMap;
use std::collections::BTreeSet; use std::collections::BTreeSet;
use std::iter; use std::iter;
use std::ops::Range;
use std::slice; use std::slice;
pub trait AstConv<'gcx, 'tcx> { pub trait AstConv<'gcx, 'tcx> {

View file

@ -309,10 +309,10 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
"no {} named `{}` found for type `{}` in the current scope", "no {} named `{}` found for type `{}` in the current scope",
item_kind, item_kind,
item_name, item_name,
ty_string ty_str
); );
if let Some(suggestion) = suggestion { if let Some(suggestion) = suggestion {
err.note(&format!("did you mean `{}::{}`?", ty_string, suggestion)); err.note(&format!("did you mean `{}::{}`?", ty_str, suggestion));
} }
err err
} }
@ -651,7 +651,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
fn type_derefs_to_local(&self, fn type_derefs_to_local(&self,
span: Span, span: Span,
rcvr_ty: Ty<'tcx>, rcvr_ty: Ty<'tcx>,
source: SelfSource) -> bool { rcvr_expr: Option<&hir::Expr>) -> bool {
fn is_local(ty: Ty) -> bool { fn is_local(ty: Ty) -> bool {
match ty.sty { match ty.sty {
ty::Adt(def, _) => def.did.is_local(), ty::Adt(def, _) => def.did.is_local(),