diff options
Diffstat (limited to 'src/librustc_lint/builtin.rs')
| -rw-r--r-- | src/librustc_lint/builtin.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 2c96b84471d..86ab8d45e4e 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -33,7 +33,7 @@ use middle::def::Def; use middle::cstore::CrateStore; use middle::def_id::DefId; use middle::subst::Substs; -use middle::ty::{self, Ty}; +use middle::ty::{self, Ty, TyCtxt}; use middle::ty::adjustment; use rustc::front::map as hir_map; use util::nodemap::{NodeSet}; @@ -774,7 +774,7 @@ impl LateLintPass for UnconditionalRecursion { // Functions for identifying if the given Expr NodeId `id` // represents a call to the function `fn_id`/method `method`. - fn expr_refers_to_this_fn(tcx: &ty::ctxt, + fn expr_refers_to_this_fn(tcx: &TyCtxt, fn_id: ast::NodeId, id: ast::NodeId) -> bool { match tcx.map.get(id) { @@ -790,7 +790,7 @@ impl LateLintPass for UnconditionalRecursion { } // Check if the expression `id` performs a call to `method`. - fn expr_refers_to_this_method(tcx: &ty::ctxt, + fn expr_refers_to_this_method(tcx: &TyCtxt, method: &ty::Method, id: ast::NodeId) -> bool { // Check for method calls and overloaded operators. @@ -838,7 +838,7 @@ impl LateLintPass for UnconditionalRecursion { // Check if the method call to the method with the ID `callee_id` // and instantiated with `callee_substs` refers to method `method`. - fn method_call_refers_to_method<'tcx>(tcx: &ty::ctxt<'tcx>, + fn method_call_refers_to_method<'tcx>(tcx: &TyCtxt<'tcx>, method: &ty::Method, callee_id: DefId, callee_substs: &Substs<'tcx>, |