diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-12-02 17:07:29 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-12-10 11:47:55 -0800 |
| commit | da50f7c288b8e6856b42fd923f3479af1c94b3bf (patch) | |
| tree | 8f1aa965704dc20ec8140fd7b7649e050ec9f0ee /src/libcoretest | |
| parent | 08a5b112ed7af90e31a355e409f637997e458fbc (diff) | |
| download | rust-da50f7c288b8e6856b42fd923f3479af1c94b3bf.tar.gz rust-da50f7c288b8e6856b42fd923f3479af1c94b3bf.zip | |
std: Remove deprecated functionality from 1.5
This is a standard "clean out libstd" commit which removes all 1.5-and-before deprecated functionality as it's now all been deprecated for at least one entire cycle.
Diffstat (limited to 'src/libcoretest')
| -rw-r--r-- | src/libcoretest/iter.rs | 12 | ||||
| -rw-r--r-- | src/libcoretest/lib.rs | 1 | ||||
| -rw-r--r-- | src/libcoretest/num/flt2dec/mod.rs | 5 | ||||
| -rw-r--r-- | src/libcoretest/num/mod.rs | 29 |
4 files changed, 3 insertions, 44 deletions
diff --git a/src/libcoretest/iter.rs b/src/libcoretest/iter.rs index 9def44191db..ba308314e9e 100644 --- a/src/libcoretest/iter.rs +++ b/src/libcoretest/iter.rs @@ -830,18 +830,6 @@ fn test_range() { } #[test] -fn test_range_inclusive() { - assert!(range_inclusive(0, 5).collect::<Vec<isize>>() == - vec![0, 1, 2, 3, 4, 5]); - assert!(range_inclusive(0, 5).rev().collect::<Vec<isize>>() == - vec![5, 4, 3, 2, 1, 0]); - assert_eq!(range_inclusive(200, -5).count(), 0); - assert_eq!(range_inclusive(200, -5).rev().count(), 0); - assert_eq!(range_inclusive(200, 200).collect::<Vec<isize>>(), [200]); - assert_eq!(range_inclusive(200, 200).rev().collect::<Vec<isize>>(), [200]); -} - -#[test] fn test_range_step() { assert_eq!((0..20).step_by(5).collect::<Vec<isize>>(), [0, 5, 10, 15]); assert_eq!((20..0).step_by(-5).collect::<Vec<isize>>(), [20, 15, 10, 5]); diff --git a/src/libcoretest/lib.rs b/src/libcoretest/lib.rs index 20da4a86bf5..88f1835d2cc 100644 --- a/src/libcoretest/lib.rs +++ b/src/libcoretest/lib.rs @@ -43,6 +43,7 @@ #![feature(unboxed_closures)] #![feature(unicode)] #![feature(unique)] +#![feature(clone_from_slice)] extern crate core; extern crate test; diff --git a/src/libcoretest/num/flt2dec/mod.rs b/src/libcoretest/num/flt2dec/mod.rs index 309bf6d8192..65b233ee92f 100644 --- a/src/libcoretest/num/flt2dec/mod.rs +++ b/src/libcoretest/num/flt2dec/mod.rs @@ -10,7 +10,6 @@ use std::prelude::v1::*; use std::{str, mem, i16, f32, f64, fmt}; -use std::slice::bytes; use std::__rand as rand; use rand::{Rand, XorShiftRng}; use rand::distributions::{IndependentSample, Range}; @@ -101,7 +100,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16 // check significant digits for i in 1..cut.unwrap_or(expected.len() - 1) { - bytes::copy_memory(&expected[..i], &mut expected_); + expected_.clone_from_slice(&expected[..i]); let mut expectedk_ = expectedk; if expected[i] >= b'5' { // check if this is a rounding-to-even case. @@ -148,7 +147,7 @@ fn check_exact<F, T>(mut f: F, v: T, vstr: &str, expected: &[u8], expectedk: i16 // check infinite zero digits if let Some(cut) = cut { for i in cut..expected.len()-1 { - bytes::copy_memory(&expected[..cut], &mut expected_); + expected_.clone_from_slice(&expected[..cut]); for c in &mut expected_[cut..i] { *c = b'0'; } try_exact!(f(&decoded) => &mut buf, &expected_[..i], expectedk; diff --git a/src/libcoretest/num/mod.rs b/src/libcoretest/num/mod.rs index 738761f3911..09f2e326503 100644 --- a/src/libcoretest/num/mod.rs +++ b/src/libcoretest/num/mod.rs @@ -55,35 +55,6 @@ mod tests { use core::num::Float; #[test] - fn from_str_issue7588() { - let u : Option<u8> = u8::from_str_radix("1000", 10).ok(); - assert_eq!(u, None); - let s : Option<i16> = i16::from_str_radix("80000", 10).ok(); - assert_eq!(s, None); - let s = "10000000000000000000000000000000000000000"; - let f : Option<f32> = f32::from_str_radix(s, 10).ok(); - assert_eq!(f, Some(Float::infinity())); - let fe : Option<f32> = f32::from_str_radix("1e40", 10).ok(); - assert_eq!(fe, Some(Float::infinity())); - } - - #[test] - fn test_from_str_radix_float() { - let x1 : Option<f64> = f64::from_str_radix("-123.456", 10).ok(); - assert_eq!(x1, Some(-123.456)); - let x2 : Option<f32> = f32::from_str_radix("123.456", 10).ok(); - assert_eq!(x2, Some(123.456)); - let x3 : Option<f32> = f32::from_str_radix("-0.0", 10).ok(); - assert_eq!(x3, Some(-0.0)); - let x4 : Option<f32> = f32::from_str_radix("0.0", 10).ok(); - assert_eq!(x4, Some(0.0)); - let x4 : Option<f32> = f32::from_str_radix("1.0", 10).ok(); - assert_eq!(x4, Some(1.0)); - let x5 : Option<f32> = f32::from_str_radix("-1.0", 10).ok(); - assert_eq!(x5, Some(-1.0)); - } - - #[test] fn test_int_from_str_overflow() { let mut i8_val: i8 = 127; assert_eq!("127".parse::<i8>().ok(), Some(i8_val)); |
