Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add a UI test that the span for the catch type error is in the right …
…place
  • Loading branch information
scottmcm committed Apr 11, 2018
1 parent c4b6521 commit aeb2353
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 0 deletions.
26 changes: 26 additions & 0 deletions src/test/ui/catch-block-type-error.rs
@@ -0,0 +1,26 @@
// Copyright 2018 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(catch_expr)]

fn foo() -> Option<()> { Some(()) }

fn main() {
let _: Option<f32> = do catch {
foo()?;
42
//~^ ERROR type mismatch
};

let _: Option<i32> = do catch {
//~^ ERROR type mismatch
foo()?;
};
}
25 changes: 25 additions & 0 deletions src/test/ui/catch-block-type-error.stderr
@@ -0,0 +1,25 @@
error[E0271]: type mismatch resolving `<std::option::Option<f32> as std::ops::Try>::Ok == {integer}`
--> $DIR/catch-block-type-error.rs:18:9
|
LL | 42
| ^^ expected f32, found integral variable
|
= note: expected type `f32`
found type `{integer}`

error[E0271]: type mismatch resolving `<std::option::Option<i32> as std::ops::Try>::Ok == ()`
--> $DIR/catch-block-type-error.rs:22:35
|
LL | let _: Option<i32> = do catch {
| ___________________________________^
LL | | //~^ ERROR type mismatch
LL | | foo()?;
LL | | };
| |_____^ expected i32, found ()
|
= note: expected type `i32`
found type `()`

error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0271`.

0 comments on commit aeb2353

Please sign in to comment.