diff options
| author | Simonas Kazlauskas <git@kazlauskas.me> | 2016-08-24 16:10:38 +0300 |
|---|---|---|
| committer | est31 <MTest31@outlook.com> | 2016-12-30 15:17:26 +0100 |
| commit | 64fbce6826bd14594e645847fd11be290ca9fade (patch) | |
| tree | 624b1368e4c0fb2bd398b7285d04093ec3cbe171 /src/test | |
| parent | 64de4e2731cff74e0c4b81d9389734dee7229db2 (diff) | |
| download | rust-64fbce6826bd14594e645847fd11be290ca9fade.tar.gz rust-64fbce6826bd14594e645847fd11be290ca9fade.zip | |
Tidy
This commit includes manual merge conflict resolution changes from a rebase by @est31.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/compile-fail/i128-feature-2.rs | 9 | ||||
| -rw-r--r-- | src/test/compile-fail/i128-feature.rs | 9 | ||||
| -rw-r--r-- | src/test/run-pass/i128.rs | 9 | ||||
| -rw-r--r-- | src/test/run-pass/u128.rs | 9 |
4 files changed, 36 insertions, 0 deletions
diff --git a/src/test/compile-fail/i128-feature-2.rs b/src/test/compile-fail/i128-feature-2.rs index b450ba33fdf..4a76d399218 100644 --- a/src/test/compile-fail/i128-feature-2.rs +++ b/src/test/compile-fail/i128-feature-2.rs @@ -1,3 +1,12 @@ +// 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. fn test1() -> i128 { //~ ERROR 128-bit type is unstable 0 } diff --git a/src/test/compile-fail/i128-feature.rs b/src/test/compile-fail/i128-feature.rs index 640cda1469d..87dda469f93 100644 --- a/src/test/compile-fail/i128-feature.rs +++ b/src/test/compile-fail/i128-feature.rs @@ -1,3 +1,12 @@ +// 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. fn test2() { 0i128; //~ ERROR 128-bit integers are not stable } diff --git a/src/test/run-pass/i128.rs b/src/test/run-pass/i128.rs index 85a3f00e946..57ef6e55935 100644 --- a/src/test/run-pass/i128.rs +++ b/src/test/run-pass/i128.rs @@ -1,3 +1,12 @@ +// 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. #![feature(i128_type)] fn main() { diff --git a/src/test/run-pass/u128.rs b/src/test/run-pass/u128.rs index 57e1ea282e0..4c6ae7b0e78 100644 --- a/src/test/run-pass/u128.rs +++ b/src/test/run-pass/u128.rs @@ -1,3 +1,12 @@ +// 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. #![feature(i128_type)] fn main() { |