hodasemi/cgmath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename map_as_vecN to with_vecN

Browse source 
This brings the method names into line with standard Rust nomenclature, for example `extra::rc::RcMut::{with_borrow, with_mut_borrow}`.
This commit is contained in:
Brendan Zabarauskas 2013-07-25 15:40:10 +10:00
parent 5fecb8fc81
commit 994b135bcd
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/math/macros.rs
View file

@ -86,13 +86,13 @@ macro_rules! impl_to_vec_helper(
)
macro_rules! impl_as_vec(
($Self:ident, 2) => (impl_as_vec_helper!(AsVec2, $Self, Vec2, as_vec2, as_mut_vec2, map_as_vec2));
($Self:ident, 3) => (impl_as_vec_helper!(AsVec3, $Self, Vec3, as_vec3, as_mut_vec3, map_as_vec3));
($Self:ident, 4) => (impl_as_vec_helper!(AsVec4, $Self, Vec4, as_vec4, as_mut_vec4, map_as_vec4));
($Self:ident, 2) => (impl_as_vec_helper!(AsVec2, $Self, Vec2, as_vec2, as_mut_vec2, with_vec2));
($Self:ident, 3) => (impl_as_vec_helper!(AsVec3, $Self, Vec3, as_vec3, as_mut_vec3, with_vec3));
($Self:ident, 4) => (impl_as_vec_helper!(AsVec4, $Self, Vec4, as_vec4, as_mut_vec4, with_vec4));
)
macro_rules! impl_as_vec_helper(
($AsVec:ident, $Self:ident, $Vec:ident, $as_vec:ident, $as_mut_vec:ident, $map_as_vec:ident) => (
($AsVec:ident, $Self:ident, $Vec:ident, $as_vec:ident, $as_mut_vec:ident, $with_vec:ident) => (
impl<T> $AsVec<T> for $Self<T> {
/// Safely transmute to a vec.
#[inline]
@ -111,7 +111,7 @@ macro_rules! impl_as_vec_helper(
/// Operate on `self` transmuted to a vec, then return the result as
/// transmuted back to the `Self` type.
#[inline]
pub fn $map_as_vec<'a>(&'a self, f: &fn(&'a $Vec<T>) -> $Vec<T>) -> $Self<T> {
pub fn $with_vec<'a>(&'a self, f: &fn(&'a $Vec<T>) -> $Vec<T>) -> $Self<T> {
use std::cast::transmute;
unsafe { transmute(f(self.$as_vec())) }
}

6
src/math/vec.rs
View file

@ -138,7 +138,7 @@ pub trait ToVec2<T> {
pub trait AsVec2<T> {
pub fn as_vec2<'a>(&'a self) -> &'a Vec2<T>;
pub fn as_mut_vec2<'a>(&'a mut self) -> &'a mut Vec2<T>;
pub fn map_as_vec2<'a>(&'a self, f: &fn(&'a Vec2<T>) -> Vec2<T>) -> Self;
pub fn with_vec2<'a>(&'a self, f: &fn(&'a Vec2<T>) -> Vec2<T>) -> Self;
}
impl_dimensioned!(Vec2, T, 2)
@ -770,7 +770,7 @@ pub trait ToVec3<T> {
pub trait AsVec3<T> {
pub fn as_vec3<'a>(&'a self) -> &'a Vec3<T>;
pub fn as_mut_vec3<'a>(&'a mut self) -> &'a mut Vec3<T>;
pub fn map_as_vec3<'a>(&'a self, f: &fn(&'a Vec3<T>) -> Vec3<T>) -> Self;
pub fn with_vec3<'a>(&'a self, f: &fn(&'a Vec3<T>) -> Vec3<T>) -> Self;
}
impl_dimensioned!(Vec3, T, 3)
@ -1476,7 +1476,7 @@ pub trait ToVec4<T> {
pub trait AsVec4<T> {
pub fn as_vec4<'a>(&'a self) -> &'a Vec4<T>;
pub fn as_mut_vec4<'a>(&'a mut self) -> &'a mut Vec4<T>;
pub fn map_as_vec4<'a>(&'a self, f: &fn(&'a Vec4<T>) -> Vec4<T>) -> Self;
pub fn with_vec4<'a>(&'a self, f: &fn(&'a Vec4<T>) -> Vec4<T>) -> Self;
}
impl_dimensioned!(Vec4, T, 4)