Rollup merge of #78738 - sasurau4:test/move-range-test-to-library-core, r=jyn514

Move range in ui test to ops test in library/core

Helps with #76268

r? ````@matklad````
This commit is contained in:
Mara Bos 2020-11-05 10:29:56 +01:00 committed by GitHub
commit 86e6afafe1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 52 deletions

View File

@ -1,6 +1,6 @@
use core::ops::{Bound, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo}; use core::ops::{Bound, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo};
// Test the Range structs without the syntactic sugar. // Test the Range structs and syntax.
#[test] #[test]
fn test_range() { fn test_range() {
@ -94,3 +94,60 @@ fn test_bound_cloned_included() {
fn test_bound_cloned_excluded() { fn test_bound_cloned_excluded() {
assert_eq!(Bound::Excluded(&3).cloned(), Bound::Excluded(3)); assert_eq!(Bound::Excluded(&3).cloned(), Bound::Excluded(3));
} }
#[test]
#[allow(unused_comparisons)]
#[allow(unused_mut)]
fn test_range_syntax() {
let mut count = 0;
for i in 0_usize..10 {
assert!(i >= 0 && i < 10);
count += i;
}
assert_eq!(count, 45);
let mut count = 0;
let mut range = 0_usize..10;
for i in range {
assert!(i >= 0 && i < 10);
count += i;
}
assert_eq!(count, 45);
let mut count = 0;
let mut rf = 3_usize..;
for i in rf.take(10) {
assert!(i >= 3 && i < 13);
count += i;
}
assert_eq!(count, 75);
let _ = 0_usize..4 + 4 - 3;
fn foo() -> isize {
42
}
let _ = 0..foo();
let _ = { &42..&100 }; // references to literals are OK
let _ = ..42_usize;
// Test we can use two different types with a common supertype.
let x = &42;
{
let y = 42;
let _ = x..&y;
}
}
#[test]
#[allow(dead_code)]
fn test_range_syntax_in_return_statement() {
fn return_range_to() -> RangeTo<i32> {
return ..1;
}
fn return_full_range() -> RangeFull {
return ..;
}
// Not much to test.
}

View File

@ -1,51 +0,0 @@
// run-pass
#![allow(unused_braces)]
#![allow(unused_comparisons)]
#![allow(dead_code)]
#![allow(unused_mut)]
// Test range syntax.
fn foo() -> isize { 42 }
// Test that range syntax works in return statements
fn return_range_to() -> ::std::ops::RangeTo<i32> { return ..1; }
fn return_full_range() -> ::std::ops::RangeFull { return ..; }
pub fn main() {
let mut count = 0;
for i in 0_usize..10 {
assert!(i >= 0 && i < 10);
count += i;
}
assert_eq!(count, 45);
let mut count = 0;
let mut range = 0_usize..10;
for i in range {
assert!(i >= 0 && i < 10);
count += i;
}
assert_eq!(count, 45);
let mut count = 0;
let mut rf = 3_usize..;
for i in rf.take(10) {
assert!(i >= 3 && i < 13);
count += i;
}
assert_eq!(count, 75);
let _ = 0_usize..4+4-3;
let _ = 0..foo();
let _ = { &42..&100 }; // references to literals are OK
let _ = ..42_usize;
// Test we can use two different types with a common supertype.
let x = &42;
{
let y = 42;
let _ = x..&y;
}
}