---

yaml
---
r: 139350
b: refs/heads/try2
c: 2c17ff7
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: aa67deff3303a14fa43e5e4693338c0b9f409e9d
+refs/heads/try2: 2c17ff7dbc667a7d579b02b86d4c08a1093683fd
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/typeck/check/mod.rs

@@ -1064,44 +1064,7 @@ pub fn impl_self_ty(vcx: &VtableContext,
                  -> ty_param_substs_and_ty {
     let tcx = vcx.tcx();
 
-    let (n_tps, region_param, raw_ty) = if did.crate == ast::local_crate {
-        let region_param = tcx.region_paramd_items.find(&did.node).
-                               map_consume(|x| *x);
-        match tcx.items.find(&did.node) {
-          Some(&ast_map::node_item(@ast::item {
-                  node: ast::item_impl(ref ts, _, st, _),
-                  _
-              }, _)) => {
-            let region_parameterization =
-                RegionParameterization::from_variance_and_generics(
-                    region_param,
-                    ts);
-            (ts.ty_params.len(),
-             region_param,
-             vcx.ccx.to_ty(&rscope::type_rscope(region_parameterization), st))
-          }
-          Some(&ast_map::node_item(@ast::item {
-                  node: ast::item_struct(_, ref ts),
-                  id: class_id,
-                  _
-              },_)) => {
-              /* If the impl is a class, the self ty is just the class ty
-                 (doing a no-op subst for the ty params; in the next step,
-                 we substitute in fresh vars for them)
-               */
-              (ts.ty_params.len(),
-               region_param,
-               ty::mk_struct(tcx, local_def(class_id),
-                      substs {
-                        self_r: rscope::bound_self_region(region_param),
-                        self_ty: None,
-                        tps: ty::ty_params_to_tys(tcx, ts)
-                      }))
-          }
-          _ => { tcx.sess.bug(~"impl_self_ty: unbound item or item that \
-               doesn't have a self_ty"); }
-        }
-    } else {
+    let (n_tps, region_param, raw_ty) = {
         let ity = ty::lookup_item_type(tcx, did);
         (vec::len(*ity.bounds), ity.region_param, ity.ty)
     };

branches/try2/src/libsyntax/parse/parser.rs

@@ -3050,8 +3050,6 @@ pub impl Parser {
         let attrs = self.parse_outer_attributes();
         let lo = self.span.lo;
 
-        let static_sty = spanned(lo, self.span.hi, sty_static);
-
         let visa = self.parse_visibility();
         let pur = self.parse_fn_purity();
         let ident = self.parse_ident();