librustc: Fix even *more* merge fallout!

Author: pcwalton

src/librustc/metadata/decoder.rs

@@ -523,10 +523,10 @@ impl<'self> EachItemContext<'self> {
                 Mod | ForeignMod | Trait | Impl => {
                     continue = self.each_item_of_module(def_id);
                 }
-                ImmStatic | MutStatic | Struct | UnsafeFn | Fn | PureFn |
-                ForeignFn | UnsafeStaticMethod | StaticMethod |
-                PureStaticMethod | Type | ForeignType | Variant | Enum |
-                PublicField | PrivateField | InheritedField => {}
+                ImmStatic | MutStatic | Struct | UnsafeFn | Fn | ForeignFn |
+                UnsafeStaticMethod | StaticMethod | Type | ForeignType |
+                Variant | Enum | PublicField | PrivateField |
+                InheritedField => {}
             }
         }
 

src/librustc/middle/ty.rs

@@ -2293,11 +2293,11 @@ pub fn type_contents(cx: ctxt, ty: t) -> TypeContents {
                 BoundCopy if store == UniqTraitStore
                             => TC_NONCOPY_TRAIT,
                 BoundCopy   => TC_NONE, // @Trait/&Trait are copyable either way
-                BoundStatic if bounds.contains_elem(BoundOwned)
-                            => TC_NONE, // Owned bound implies static bound.
+                BoundStatic if bounds.contains_elem(BoundSend)
+                            => TC_NONE, // Send bound implies static bound.
                 BoundStatic => TC_BORROWED_POINTER, // Useful for "@Trait:'static"
-                BoundOwned  => TC_NON_OWNED,
-                BoundConst  => TC_MUTABLE,
+                BoundSend   => TC_NON_SENDABLE,
+                BoundFreeze => TC_MUTABLE,
                 BoundSized  => TC_NONE, // don't care if interior is sized
             };
         }

src/librustc/middle/typeck/astconv.rs

@@ -790,7 +790,7 @@ fn conv_builtin_bounds(tcx: ty::ctxt, ast_bounds: &Option<OptVec<ast::TyParamBou
         },
         // ~Trait is sugar for ~Trait:Owned.
         (&None, ty::UniqTraitStore) => {
-            let mut set = ty::EmptyBuiltinBounds(); set.add(ty::BoundOwned); set
+            let mut set = ty::EmptyBuiltinBounds(); set.add(ty::BoundSend); set
         }
         // @Trait is sugar for @Trait:'static.
         // &'static Trait is sugar for &'static Trait:'static.

src/librustpkg/rustpkg.rs

@@ -192,6 +192,7 @@ pub trait CtxMethods {
     fn clean(&self, workspace: &Path, id: &PkgId);
     fn info(&self);
     fn install(&self, workspace: &Path, id: &PkgId);
+    fn install_no_build(&self, workspace: &Path, id: &PkgId);
     fn prefer(&self, _id: &str, _vers: Option<~str>);
     fn test(&self);
     fn uninstall(&self, _id: &str, _vers: Option<~str>);