user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #23506: alexcrichton/remove-some-deprecated-things

Browse source 
Conflicts:
	src/test/run-pass/deprecated-no-split-stack.rs
This commit is contained in:
Alex Crichton 2015-03-23 15:27:06 -07:00
commit 3112716f12
10 changed files with 29 additions and 381 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/test/compile-fail/deriving-is-deprecated.rs
View file

@ -1,15 +0,0 @@
// Copyright 2015 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.
#[deriving(Clone)] //~ ERROR `deriving` has been renamed to `derive`
struct Foo;
fn main() {}

36
src/test/compile-fail/hrtb-precedence-of-plus-error-message.rs
View file

@ -1,36 +0,0 @@
// 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.
#![feature(unboxed_closures)]
// Test that we suggest the correct parentheses
trait Bar {
fn dummy(&self) { }
}
struct Foo<'a> {
a: &'a Bar+'a,
//~^ ERROR E0178
//~^^ HELP perhaps you meant `&'a (Bar + 'a)`?
b: &'a mut Bar+'a,
//~^ ERROR E0178
//~^^ HELP perhaps you meant `&'a mut (Bar + 'a)`?
c: Box<Bar+'a>, // OK, no paren needed in this context
d: fn() -> Bar+'a,
//~^ ERROR E0178
//~^^ HELP perhaps you forgot parentheses
//~^^^ WARN deprecated syntax
}
fn main() { }

17
src/test/parse-fail/obsolete-for-sized.rs
View file

@ -1,17 +0,0 @@
// Copyright 2015 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 we generate obsolete syntax errors around usages of `for Sized?`
trait Foo for Sized? {} //~ ERROR obsolete syntax: for Sized?
trait Bar for ?Sized {} //~ ERROR obsolete syntax: for Sized?
fn main() { }

16
src/test/run-pass/deprecated-no-split-stack.rs
View file

@ -1,16 +0,0 @@
// 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.
//~ WARNING no_split_stack is a deprecated synonym for no_stack_check
// pretty-expanded FIXME #23616
#[no_split_stack]
fn main() {
}