reviewer changes
This commit is contained in:
parent
31a7e38759
commit
cf9c586fcc
5 changed files with 69 additions and 3 deletions
|
@ -16,4 +16,4 @@ fn main() {
|
||||||
let x = Foo;
|
let x = Foo;
|
||||||
x[..]; //~ ERROR incorrect slicing expression: `[..]`
|
x[..]; //~ ERROR incorrect slicing expression: `[..]`
|
||||||
//~^ NOTE use `expr[]` to construct a slice of the whole of expr
|
//~^ NOTE use `expr[]` to construct a slice of the whole of expr
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,4 +22,4 @@ fn main() {
|
||||||
x[mut Foo..]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
x[mut Foo..]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
||||||
x[mut ..Foo]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
x[mut ..Foo]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
||||||
x[mut Foo..Foo]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
x[mut Foo..Foo]; //~ ERROR cannot take a mutable slice of a value with type `Foo`
|
||||||
}
|
}
|
||||||
|
|
31
src/test/run-pass/slice-fail-1.rs
Normal file
31
src/test/run-pass/slice-fail-1.rs
Normal file
|
@ -0,0 +1,31 @@
|
||||||
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// Test that is a slicing expr[..] fails, the correct cleanups happen.
|
||||||
|
|
||||||
|
use std::task;
|
||||||
|
|
||||||
|
struct Foo;
|
||||||
|
|
||||||
|
static mut DTOR_COUNT: int = 0;
|
||||||
|
|
||||||
|
impl Drop for Foo {
|
||||||
|
fn drop(&mut self) { unsafe { DTOR_COUNT += 1; } }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn foo() {
|
||||||
|
let x: &[_] = &[Foo, Foo];
|
||||||
|
x[3..4];
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = task::try(proc() foo());
|
||||||
|
unsafe { assert!(DTOR_COUNT == 2); }
|
||||||
|
}
|
35
src/test/run-pass/slice-fail-2.rs
Normal file
35
src/test/run-pass/slice-fail-2.rs
Normal file
|
@ -0,0 +1,35 @@
|
||||||
|
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
|
||||||
|
// file at the top-level directory of this distribution and at
|
||||||
|
// http://rust-lang.org/COPYRIGHT.
|
||||||
|
//
|
||||||
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||||
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||||
|
// option. This file may not be copied, modified, or distributed
|
||||||
|
// except according to those terms.
|
||||||
|
|
||||||
|
// Test that is a slicing expr[..] fails, the correct cleanups happen.
|
||||||
|
|
||||||
|
use std::task;
|
||||||
|
|
||||||
|
struct Foo;
|
||||||
|
|
||||||
|
static mut DTOR_COUNT: int = 0;
|
||||||
|
|
||||||
|
impl Drop for Foo {
|
||||||
|
fn drop(&mut self) { unsafe { DTOR_COUNT += 1; } }
|
||||||
|
}
|
||||||
|
|
||||||
|
fn bar() -> uint {
|
||||||
|
fail!();
|
||||||
|
}
|
||||||
|
|
||||||
|
fn foo() {
|
||||||
|
let x: &[_] = &[Foo, Foo];
|
||||||
|
x[3..bar()];
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _ = task::try(proc() foo());
|
||||||
|
unsafe { assert!(DTOR_COUNT == 2); }
|
||||||
|
}
|
|
@ -67,4 +67,4 @@ fn main() {
|
||||||
unsafe {
|
unsafe {
|
||||||
assert!(COUNT == 8);
|
assert!(COUNT == 8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue