librustc: Implement overloading for the call operator behind a feature

[rust.git] / src / librustc / middle / typeck / check / regionck.rs

diff --git a/src/librustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs
index e488a946d4a14deae9248086f154691fd8d7c040..d3ddbcf5b38a412dd01627182cc8cd630be72f1b 100644 (file)
--- a/src/librustc/middle/typeck/check/regionck.rs
+++ b/src/librustc/middle/typeck/check/regionck.rs
@@ -442,13 +442,15 @@ fn visit_expr(rcx: &mut Rcx, expr: &ast::Expr) {
 
     match expr.node {
         ast::ExprCall(callee, ref args) => {
-            constrain_callee(rcx, callee.id, expr, callee);
-            constrain_call(rcx,
-                           Some(callee.id),
-                           expr,
-                           None,
-                           args.as_slice(),
-                           false);
+            if !has_method_map {
+                constrain_callee(rcx, callee.id, expr, callee);
+                constrain_call(rcx,
+                               Some(callee.id),
+                               expr,
+                               None,
+                               args.as_slice(),
+                               false);
+            }
 
             visit::walk_expr(rcx, expr, ());
         }