diff options
| author | Chris Wong <lambda.fairy@gmail.com> | 2015-02-13 19:23:28 +1300 |
|---|---|---|
| committer | Chris Wong <lambda.fairy@gmail.com> | 2015-02-13 19:40:22 +1300 |
| commit | b4a286144dfbc587604353be2fb3c9e27d405f9e (patch) | |
| tree | 1ec273c698a9aca695a6a929f80ae58ec72d5b3f /src | |
| parent | ba2efe96aeada34c1e2dc267a1a35948bdda91f8 (diff) | |
| download | rust-b4a286144dfbc587604353be2fb3c9e27d405f9e.tar.gz rust-b4a286144dfbc587604353be2fb3c9e27d405f9e.zip | |
Rename the "unsafe" lang item to "unsafe_cell"
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/cell.rs | 3 | ||||
| -rw-r--r-- | src/librustc/middle/lang_items.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/traits/select.rs | 2 | ||||
| -rw-r--r-- | src/librustc/middle/ty.rs | 2 | ||||
| -rw-r--r-- | src/librustc_typeck/variance.rs | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/src/libcore/cell.rs b/src/libcore/cell.rs index 050b34508ff..cf293ded13f 100644 --- a/src/libcore/cell.rs +++ b/src/libcore/cell.rs @@ -649,7 +649,8 @@ impl<'b, T> DerefMut for RefMut<'b, T> { /// /// **NOTE:** `UnsafeCell<T>`'s fields are public to allow static initializers. It is not /// recommended to access its fields directly, `get` should be used instead. -#[lang="unsafe"] +#[cfg_attr(stage0, lang="unsafe")] // NOTE: remove after next snapshot +#[cfg_attr(not(stage0), lang="unsafe_cell")] #[stable(feature = "rust1", since = "1.0.0")] pub struct UnsafeCell<T> { /// Wrapped value diff --git a/src/librustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs index ef72c2242c1..e13a5672778 100644 --- a/src/librustc/middle/lang_items.rs +++ b/src/librustc/middle/lang_items.rs @@ -271,7 +271,7 @@ lets_do_this! { RangeToStructLangItem, "range_to", range_to_struct; RangeFullStructLangItem, "range_full", range_full_struct; - UnsafeTypeLangItem, "unsafe", unsafe_type; + UnsafeCellTypeLangItem, "unsafe_cell", unsafe_cell_type; DerefTraitLangItem, "deref", deref_trait; DerefMutTraitLangItem, "deref_mut", deref_mut_trait; diff --git a/src/librustc/middle/traits/select.rs b/src/librustc/middle/traits/select.rs index 5f659aa303e..6f58f4655fe 100644 --- a/src/librustc/middle/traits/select.rs +++ b/src/librustc/middle/traits/select.rs @@ -1654,7 +1654,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> { ty::BoundSync => { if Some(def_id) == tcx.lang_items.managed_bound() || - Some(def_id) == tcx.lang_items.unsafe_type() + Some(def_id) == tcx.lang_items.unsafe_cell_type() { return Err(Unimplemented) } diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs index 6026359ddac..e276683236f 100644 --- a/src/librustc/middle/ty.rs +++ b/src/librustc/middle/ty.rs @@ -3577,7 +3577,7 @@ pub fn type_contents<'tcx>(cx: &ctxt<'tcx>, ty: Ty<'tcx>) -> TypeContents { -> TypeContents { if Some(did) == cx.lang_items.managed_bound() { tc | TC::Managed - } else if Some(did) == cx.lang_items.unsafe_type() { + } else if Some(did) == cx.lang_items.unsafe_cell_type() { tc | TC::InteriorUnsafe } else { tc diff --git a/src/librustc_typeck/variance.rs b/src/librustc_typeck/variance.rs index 567a388836f..66fce6dded3 100644 --- a/src/librustc_typeck/variance.rs +++ b/src/librustc_typeck/variance.rs @@ -453,7 +453,7 @@ fn add_constraints_from_crate<'a, 'tcx>(terms_cx: TermsContext<'a, 'tcx>, invariant_lang_items[RegionParam as uint] = terms_cx.tcx.lang_items.invariant_lifetime(); - let unsafe_lang_item = terms_cx.tcx.lang_items.unsafe_type(); + let unsafe_lang_item = terms_cx.tcx.lang_items.unsafe_cell_type(); let covariant = terms_cx.arena.alloc(ConstantTerm(ty::Covariant)); let contravariant = terms_cx.arena.alloc(ConstantTerm(ty::Contravariant)); |