From 133834084e7fb8efba6e9c25816b6d4de03007ff Mon Sep 17 00:00:00 2001 From: John Simon Date: Sun, 13 Apr 2014 17:23:17 -0400 Subject: Replace 'region' with 'lifetime' in a few transmute function names --- src/libstd/cast.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/cast.rs b/src/libstd/cast.rs index de9e916c746..f9f9e395f2e 100644 --- a/src/libstd/cast.rs +++ b/src/libstd/cast.rs @@ -63,9 +63,9 @@ pub unsafe fn transmute(thing: L) -> G { #[inline] pub unsafe fn transmute_mut<'a,T>(ptr: &'a T) -> &'a mut T { transmute(ptr) } -/// Coerce a reference to have an arbitrary associated region. +/// Coerce a reference to have an arbitrary associated lifetime. #[inline] -pub unsafe fn transmute_region<'a,'b,T>(ptr: &'a T) -> &'b T { +pub unsafe fn transmute_lifetime<'a,'b,T>(ptr: &'a T) -> &'b T { transmute(ptr) } @@ -75,28 +75,28 @@ pub unsafe fn transmute_mut_unsafe(ptr: *T) -> *mut T { transmute(ptr) } -/// Coerce a mutable reference to have an arbitrary associated region. +/// Coerce a mutable reference to have an arbitrary associated lifetime. #[inline] -pub unsafe fn transmute_mut_region<'a,'b,T>(ptr: &'a mut T) -> &'b mut T { +pub unsafe fn transmute_mut_lifetime<'a,'b,T>(ptr: &'a mut T) -> &'b mut T { transmute(ptr) } /// Transforms lifetime of the second pointer to match the first. #[inline] pub unsafe fn copy_lifetime<'a,S,T>(_ptr: &'a S, ptr: &T) -> &'a T { - transmute_region(ptr) + transmute_lifetime(ptr) } /// Transforms lifetime of the second pointer to match the first. #[inline] pub unsafe fn copy_mut_lifetime<'a,S,T>(_ptr: &'a mut S, ptr: &mut T) -> &'a mut T { - transmute_mut_region(ptr) + transmute_mut_lifetime(ptr) } /// Transforms lifetime of the second pointer to match the first. #[inline] pub unsafe fn copy_lifetime_vec<'a,S,T>(_ptr: &'a [S], ptr: &T) -> &'a T { - transmute_region(ptr) + transmute_lifetime(ptr) } -- cgit 1.4.1-3-g733a5