diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-06-27 11:16:53 -0700 |
|---|---|---|
| committer | Corey Richardson <corey@octayn.net> | 2013-06-28 10:47:59 -0400 |
| commit | f25f466afe7d4d94d711e4f288fd39ab72f1cc61 (patch) | |
| tree | 24a07c645104ff214d1b3a62da1d086b76886f90 /src | |
| parent | f6a27cbda273d5d39af953bca12990cc4930382c (diff) | |
| download | rust-f25f466afe7d4d94d711e4f288fd39ab72f1cc61.tar.gz rust-f25f466afe7d4d94d711e4f288fd39ab72f1cc61.zip | |
librustc: Fix even *more* merge fallout!
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc/metadata/decoder.rs | 8 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 8 | ||||
| -rw-r--r-- | src/librustc/middle/typeck/astconv.rs | 2 | ||||
| -rw-r--r-- | src/librustpkg/rustpkg.rs | 1 |
4 files changed, 10 insertions, 9 deletions
diff --git a/src/librustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs index ba8df3a6038..69faf519bc2 100644 --- a/src/librustc/metadata/decoder.rs +++ b/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 => {} } } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index f88c5998862..175529be206 100644 --- a/src/librustc/middle/ty.rs +++ b/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 }; } diff --git a/src/librustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs index 70df9877162..3d0cbec8b1a 100644 --- a/src/librustc/middle/typeck/astconv.rs +++ b/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. diff --git a/src/librustpkg/rustpkg.rs b/src/librustpkg/rustpkg.rs index ca13ba39d59..550a3411b5d 100644 --- a/src/librustpkg/rustpkg.rs +++ b/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>); |