Merge pull request #65 from luqmana/master

Update for latest rust.
This commit is contained in:
Corey Richardson 2014-05-12 18:21:18 -07:00
commit 10e911d180
3 changed files with 5 additions and 7 deletions

View file

@ -12,9 +12,7 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#[feature(globs)]; #![feature(globs)]
#[feature(globs)];
extern crate cgmath; extern crate cgmath;
extern crate test; extern crate test;

View file

@ -59,17 +59,17 @@ macro_rules! array(
#[inline] #[inline]
fn as_slice<'a>(&'a self) -> &'a [$T,..$n] { fn as_slice<'a>(&'a self) -> &'a [$T,..$n] {
unsafe { ::std::cast::transmute(self) } unsafe { ::std::mem::transmute(self) }
} }
#[inline] #[inline]
fn as_mut_slice<'a>(&'a mut self) -> &'a mut [$T,..$n] { fn as_mut_slice<'a>(&'a mut self) -> &'a mut [$T,..$n] {
unsafe { ::std::cast::transmute(self) } unsafe { ::std::mem::transmute(self) }
} }
#[inline] #[inline]
fn from_slice(slice: [$T,..$n]) -> $Self { fn from_slice(slice: [$T,..$n]) -> $Self {
unsafe { ::std::cast::transmute(slice) } unsafe { ::std::mem::transmute(slice) }
} }
#[inline] #[inline]

View file

@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
use std::cast::transmute; use std::mem::transmute;
use std::fmt; use std::fmt;
use std::num::Zero; use std::num::Zero;