Cleanup. Generalized last bugfix to projections.

Removed unused imports and fixed projections in a similar, but much more
ugly manner. This will have to be cleanly solved in rustc.

Author: ibabushkin

src/bin/rust_semverver.rs

@@ -6,8 +6,6 @@ extern crate getopts;
 extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_errors;
-extern crate rustc_metadata;
-extern crate semver;
 extern crate semverver;
 extern crate syntax;
 

src/lib.rs

@@ -10,8 +10,6 @@ extern crate log;
 extern crate quickcheck;
 
 extern crate rustc;
-extern crate rustc_data_structures;
-extern crate rustc_errors;
 extern crate semver;
 extern crate syntax;
 extern crate syntax_pos;

src/semcheck/translate.rs

@@ -202,13 +202,20 @@ impl<'a, 'gcx, 'tcx> TranslationContext<'a, 'gcx, 'tcx> {
                                     err_pred
                                 }
                             },
-                            Projection(ExistentialProjection { item_def_id, substs, ty }) => {
+                            Projection(existential_projection) => {
+                                let projection_pred = Binder(existential_projection)
+                                    .with_self_ty(self.tcx, self.tcx.types.err);
+                                let item_def_id =
+                                    projection_pred.skip_binder().projection_ty.item_def_id;
+                                let substs = projection_pred.skip_binder().projection_ty.substs;
+
                                 if let Some((target_def_id, target_substs)) =
                                     self.translate_orig_substs(index_map, item_def_id, substs)
                                 {
                                     Projection(ExistentialProjection {
                                         item_def_id: target_def_id,
-                                        substs: target_substs,
+                                        // TODO: should be it's own method in rustc
+                                        substs: self.tcx.intern_substs(&target_substs[1..]),
                                         ty: ty,
                                     })
                                 } else {

tests/cases/trait_objects/new.rs

@@ -0,0 +1,13 @@
+#![feature(unboxed_closures)]
+
+pub trait Abc { }
+
+pub struct Def;
+
+impl Abc for Def { }
+
+pub fn a(_: &Abc) { }
+
+pub trait A<T> { }
+
+pub type Something = A<()>;

tests/cases/trait_objects/old.rs

@@ -0,0 +1,13 @@
+#![feature(unboxed_closures)]
+
+pub trait Abc { }
+
+pub struct Def;
+
+impl Abc for Def { }
+
+pub fn a(_: &Abc) { }
+
+pub trait A<T> { }
+
+pub type Something = A<()>;

tests/cases/trait_objects/stdout

@@ -0,0 +1 @@
+version bump: 1.0.0 -> (patch) -> 1.0.1