about summary refs log tree commit diff
path: root/src/test/compile-fail/allocator
diff options
context:
space:
mode:
authorDavid Wood <david@davidtw.co>2018-08-08 14:28:26 +0200
committerDavid Wood <david@davidtw.co>2018-08-14 10:38:00 +0200
commitb16a30677f4e641329e768272cf9d3ecc2fa31c4 (patch)
treed3e652eb74da6147d2ae1514977c93c785c733a2 /src/test/compile-fail/allocator
parentfe28bcf1db02afe184e3677ee034b2a5804f2466 (diff)
Moved compile-fail tests to ui tests.
Diffstat (limited to 'src/test/compile-fail/allocator')
-rw-r--r--src/test/compile-fail/allocator/auxiliary/system-allocator.rs18
-rw-r--r--src/test/compile-fail/allocator/auxiliary/system-allocator2.rs18
-rw-r--r--src/test/compile-fail/allocator/function-allocator.rs15
-rw-r--r--src/test/compile-fail/allocator/not-an-allocator.rs18
-rw-r--r--src/test/compile-fail/allocator/two-allocators.rs20
-rw-r--r--src/test/compile-fail/allocator/two-allocators2.rs23
-rw-r--r--src/test/compile-fail/allocator/two-allocators3.rs20
7 files changed, 0 insertions, 132 deletions
diff --git a/src/test/compile-fail/allocator/auxiliary/system-allocator.rs b/src/test/compile-fail/allocator/auxiliary/system-allocator.rs
deleted file mode 100644
index e5650d5b7b0..00000000000
--- a/src/test/compile-fail/allocator/auxiliary/system-allocator.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 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.
-
-// no-prefer-dynamic
-
-#![crate_type = "rlib"]
-
-use std::alloc::System;
-
-#[global_allocator]
-static A: System = System;
diff --git a/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs b/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs
deleted file mode 100644
index e5650d5b7b0..00000000000
--- a/src/test/compile-fail/allocator/auxiliary/system-allocator2.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 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.
-
-// no-prefer-dynamic
-
-#![crate_type = "rlib"]
-
-use std::alloc::System;
-
-#[global_allocator]
-static A: System = System;
diff --git a/src/test/compile-fail/allocator/function-allocator.rs b/src/test/compile-fail/allocator/function-allocator.rs
deleted file mode 100644
index 989c102b86e..00000000000
--- a/src/test/compile-fail/allocator/function-allocator.rs
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 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.
-
-
-#[global_allocator]
-fn foo() {} //~ ERROR: allocators must be statics
-
-fn main() {}
diff --git a/src/test/compile-fail/allocator/not-an-allocator.rs b/src/test/compile-fail/allocator/not-an-allocator.rs
deleted file mode 100644
index 6559335960a..00000000000
--- a/src/test/compile-fail/allocator/not-an-allocator.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 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.
-
-#[global_allocator]
-static A: usize = 0;
-//~^ the trait bound `usize:
-//~| the trait bound `usize:
-//~| the trait bound `usize:
-//~| the trait bound `usize:
-
-fn main() {}
diff --git a/src/test/compile-fail/allocator/two-allocators.rs b/src/test/compile-fail/allocator/two-allocators.rs
deleted file mode 100644
index 7a97a11df20..00000000000
--- a/src/test/compile-fail/allocator/two-allocators.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 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.
-
-use std::alloc::System;
-
-#[global_allocator]
-static A: System = System;
-#[global_allocator]
-static B: System = System;
-//~^ ERROR: cannot define more than one #[global_allocator]
-
-fn main() {}
-
diff --git a/src/test/compile-fail/allocator/two-allocators2.rs b/src/test/compile-fail/allocator/two-allocators2.rs
deleted file mode 100644
index e747140dfe5..00000000000
--- a/src/test/compile-fail/allocator/two-allocators2.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 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.
-
-// aux-build:system-allocator.rs
-// no-prefer-dynamic
-// error-pattern: the #[global_allocator] in
-
-extern crate system_allocator;
-
-use std::alloc::System;
-
-#[global_allocator]
-static A: System = System;
-
-fn main() {}
-
diff --git a/src/test/compile-fail/allocator/two-allocators3.rs b/src/test/compile-fail/allocator/two-allocators3.rs
deleted file mode 100644
index dd86b02bd20..00000000000
--- a/src/test/compile-fail/allocator/two-allocators3.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 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.
-
-// aux-build:system-allocator.rs
-// aux-build:system-allocator2.rs
-// no-prefer-dynamic
-// error-pattern: the #[global_allocator] in
-
-
-extern crate system_allocator;
-extern crate system_allocator2;
-
-fn main() {}