Skip to content

Commit

Permalink
Rollup merge of rust-lang#78738 - sasurau4:test/move-range-test-to-li…
Browse files Browse the repository at this point in the history
…brary-core, r=jyn514

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

Helps with rust-lang#76268

r? `@matklad`
  • Loading branch information
JohnTitor authored Nov 5, 2020
2 parents 41d11a1 + 232b9ba commit 2d63234
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 52 deletions.
59 changes: 58 additions & 1 deletion library/core/tests/ops.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use core::ops::{Bound, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo};

// Test the Range structs without the syntactic sugar.
// Test the Range structs and syntax.

#[test]
fn test_range() {
Expand Down Expand Up @@ -94,3 +94,60 @@ fn test_bound_cloned_included() {
fn test_bound_cloned_excluded() {
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.
}
51 changes: 0 additions & 51 deletions src/test/ui/range.rs

This file was deleted.

0 comments on commit 2d63234

Please sign in to comment.