diff options
| author | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-30 04:17:05 +0000 |
| commit | d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1 (patch) | |
| tree | 59ac1ead4709d7b31c16dcab52e9511f905ae761 /src/test | |
| parent | 15e8c5d8466ae40c1ef9b2a1d96f9cd2c4dcccf0 (diff) | |
| parent | 67e0c2b52939de562fb06910295a6247750c11bc (diff) | |
| download | rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.tar.gz rust-d8a1bc73f742d5c1e747270bdc8b5a6e97ba3bb1.zip | |
Auto merge of #49489 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #49443, #49445, #49446, #49463, #49464, #49466, #49468, #49473, #49484, #49486 - Failed merges:
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/codegen/stack-probes.rs | 1 | ||||
| -rw-r--r-- | src/test/run-pass/stack-probes-lto.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/stack-probes.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/suggestions/try-on-option.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/suggestions/try-operator-on-main.stderr | 2 |
5 files changed, 7 insertions, 2 deletions
diff --git a/src/test/codegen/stack-probes.rs b/src/test/codegen/stack-probes.rs index af400ff3bcb..51ebc42a0dd 100644 --- a/src/test/codegen/stack-probes.rs +++ b/src/test/codegen/stack-probes.rs @@ -13,6 +13,7 @@ // ignore-mips // ignore-mips64 // ignore-powerpc +// ignore-s390x // ignore-wasm // ignore-emscripten // ignore-windows diff --git a/src/test/run-pass/stack-probes-lto.rs b/src/test/run-pass/stack-probes-lto.rs index e7fa3bc0a75..d1cb75909c1 100644 --- a/src/test/run-pass/stack-probes-lto.rs +++ b/src/test/run-pass/stack-probes-lto.rs @@ -12,6 +12,8 @@ // ignore-aarch64 // ignore-mips // ignore-mips64 +// ignore-powerpc +// ignore-s390x // ignore-wasm // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/stack-probes.rs b/src/test/run-pass/stack-probes.rs index 67b3962ee5f..78c5782be38 100644 --- a/src/test/run-pass/stack-probes.rs +++ b/src/test/run-pass/stack-probes.rs @@ -12,6 +12,8 @@ // ignore-aarch64 // ignore-mips // ignore-mips64 +// ignore-powerpc +// ignore-s390x // ignore-wasm // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/ui/suggestions/try-on-option.stderr b/src/test/ui/suggestions/try-on-option.stderr index aee52808f1e..265ee593bb7 100644 --- a/src/test/ui/suggestions/try-on-option.stderr +++ b/src/test/ui/suggestions/try-on-option.stderr @@ -6,7 +6,7 @@ LL | x?; //~ the trait bound | = note: required by `std::convert::From::from` -error[E0277]: the `?` operator can only be used in a function that returns `Result` (or another type that implements `std::ops::Try`) +error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) --> $DIR/try-on-option.rs:23:5 | LL | x?; //~ the `?` operator diff --git a/src/test/ui/suggestions/try-operator-on-main.stderr b/src/test/ui/suggestions/try-operator-on-main.stderr index 7536bbcd2db..121ae14f999 100644 --- a/src/test/ui/suggestions/try-operator-on-main.stderr +++ b/src/test/ui/suggestions/try-operator-on-main.stderr @@ -1,4 +1,4 @@ -error[E0277]: the `?` operator can only be used in a function that returns `Result` (or another type that implements `std::ops::Try`) +error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `std::ops::Try`) --> $DIR/try-operator-on-main.rs:19:5 | LL | std::fs::File::open("foo")?; //~ ERROR the `?` operator can only |