xeos
/
num-traits
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to rust nightly

This commit is contained in:
Alex Crichton 2015-08-10 12:11:56 -07:00
parent d4e7a6654f
commit b57accf314
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
num-macros/src/lib.rs
View File

@ -46,19 +46,13 @@ macro_rules! path_local {
} }
macro_rules! pathvec_std { macro_rules! pathvec_std {
($cx:expr, $first:ident :: $($rest:ident)::+) => ( ($cx:expr, $first:ident :: $($rest:ident)::+) => ({
if $cx.use_std { let mut v = pathvec!($($rest)::+);
pathvec!(std :: $($rest)::+) if let Some(s) = $cx.crate_root {
} else { v.insert(0, s);
pathvec!($first :: $($rest)::+)
} }
) v
} })
macro_rules! path_std {
($($x:tt)*) => (
::syntax::ext::deriving::generic::ty::Path::new( pathvec_std!( $($x)* ) )
)
} }
pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt, pub fn expand_deriving_from_primitive(cx: &mut ExtCtxt,

2
src/bigint.rs
View File

@ -1949,7 +1949,7 @@ mod biguint_tests {
#[test] #[test]
fn test_cmp() { fn test_cmp() {
let data: [&[_]; 7] = [ &[], &[1], &[2], &[-1], &[0, 1], &[2, 1], &[1, 1, 1] ]; let data: [&[_]; 7] = [ &[], &[1], &[2], &[!0], &[0, 1], &[2, 1], &[1, 1, 1] ];
let data: Vec<BigUint> = data.iter().map(|v| BigUint::from_slice(*v)).collect(); let data: Vec<BigUint> = data.iter().map(|v| BigUint::from_slice(*v)).collect();
for (i, ni) in data.iter().enumerate() { for (i, ni) in data.iter().enumerate() {
for (j0, nj) in data[i..].iter().enumerate() { for (j0, nj) in data[i..].iter().enumerate() {