Parse and resolve implementations.

Issue #1227

Author: marijnh

src/comp/driver/rustc.rs

@@ -162,7 +162,7 @@ fn compile_input(sess: session::session, cfg: ast::crate_cfg, input: str,
              bind middle::ast_map::map_crate(*crate));
     time(time_passes, "external crate/lib resolution",
          bind creader::read_crates(sess, *crate));
-    let {def_map: def_map, ext_map: ext_map, exp_map: exp_map} =
+    let {def_map, ext_map, exp_map, impl_map} =
         time(time_passes, "resolution",
              bind resolve::resolve_crate(sess, ast_map, crate));
     let freevars =
@@ -171,7 +171,8 @@ fn compile_input(sess: session::session, cfg: ast::crate_cfg, input: str,
     time(time_passes, "const checking",
          bind middle::check_const::check_crate(sess, crate));
     let ty_cx = ty::mk_ctxt(sess, def_map, ext_map, ast_map, freevars);
-    time(time_passes, "typechecking", bind typeck::check_crate(ty_cx, crate));
+    time(time_passes, "typechecking",
+         bind typeck::check_crate(ty_cx, impl_map, crate));
     time(time_passes, "block-use checking",
          bind middle::block_use::check_crate(ty_cx, crate));
     time(time_passes, "function usage",
@@ -267,11 +268,11 @@ fn pretty_print_input(sess: session::session, cfg: ast::crate_cfg, input: str,
       ppm_typed. {
         crate = syntax::ext::expand::expand_crate(sess, crate);
         let amap = middle::ast_map::map_crate(*crate);
-        let {def_map: def_map, ext_map: ext_map, exp_map: _exp_map} =
+        let {def_map, ext_map, impl_map, _} =
             resolve::resolve_crate(sess, amap, crate);
         let freevars = freevars::annotate_freevars(def_map, crate);
         let ty_cx = ty::mk_ctxt(sess, def_map, ext_map, amap, freevars);
-        typeck::check_crate(ty_cx, crate);
+        typeck::check_crate(ty_cx, impl_map, crate);
         ann = {pre: ann_paren_for_expr, post: bind ann_typed_post(ty_cx, _)};
       }
       ppm_identified. {

src/comp/middle/alias.rs

@@ -532,7 +532,7 @@ fn ty_can_unsafely_include(cx: ctx, needle: unsafe_ty, haystack: ty::t,
 fn def_is_local(d: ast::def, objfields_count: bool) -> bool {
     ret alt d {
           ast::def_local(_, _) | ast::def_arg(_, _) | ast::def_binding(_) |
-          ast::def_upvar(_, _, _) {
+          ast::def_upvar(_, _, _) | ast::def_self(_) {
             true
           }
           ast::def_obj_field(_, _) { objfields_count }

src/comp/middle/mut.rs

@@ -264,6 +264,7 @@ fn is_immutable_def(def: def) -> option::t<str> {
       def_arg(_, by_ref.) | def_arg(_, by_val.) |
       def_arg(_, mode_infer.) { some("argument") }
       def_obj_field(_, imm.) { some("immutable object field") }
+      def_self(_) { some("self argument") }
       def_upvar(_, inner, mut) {
         if !mut { some("upvar") } else { is_immutable_def(*inner) }
       }