Skip to content

Commit

Permalink
Merge pull request #27 from Sean1708/rustup-1.5.0-cff041170-2015-09-17
Browse files Browse the repository at this point in the history
Fix compilation on the latest nightly.
  • Loading branch information
shailesh1729 committed Sep 19, 2015
2 parents d75b9a3 + 41a78be commit 344cdbc
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
extern crate log;
extern crate rand;
extern crate num;
extern crate alloc;

// Common modules
pub mod error;
Expand Down
2 changes: 1 addition & 1 deletion src/matrix/matrix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ use std::cmp;
use std::fmt;
use num::{Float};
use std::iter::Iterator;
use std::rt::heap::{allocate, deallocate};
use std::ops::{Index};
use std::raw::Slice;

// external imports
use num::traits::{Zero, One, Signed};
use num::complex::{Complex32, Complex64};
use alloc::heap::{allocate, deallocate};

// local imports

Expand Down
2 changes: 1 addition & 1 deletion src/matrix/triangular_matrix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
use std::ptr;
use std::mem;
use std::fmt;
use std::rt::heap::allocate;

// external imports
use num::traits::{Zero, One};
use alloc::heap::allocate;
// complex numbers
use num::complex::{Complex32, Complex64};

Expand Down
4 changes: 3 additions & 1 deletion src/util/memory.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@

// std imports
use std::mem;
use std::rt::heap::{deallocate};

// external imports
use alloc::heap::{deallocate};



Expand Down

0 comments on commit 344cdbc

Please sign in to comment.