From 72334fee6fad3c51a036d7f592915ea472959714 Mon Sep 17 00:00:00 2001
From: Tyler Mandry <tmandry@gmail.com>
Date: Tue, 20 Mar 2018 14:19:16 -0500
Subject: [PATCH] typeck: Report main return type errors on return type span

---
 src/librustc_typeck/check/mod.rs                      |  3 ++-
 .../termination-trait-main-wrong-type.rs              |  3 +--
 .../termination-trait-main-wrong-type.stderr          | 11 +++++++++++
 3 files changed, 14 insertions(+), 3 deletions(-)
 rename src/test/{compile-fail => ui}/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs (80%)
 create mode 100644 src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 42bf516a0afa..a951fa7eb220 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -1114,8 +1114,9 @@ fn check_fn<'a, 'gcx, 'tcx>(inherited: &'a Inherited<'a, 'gcx, 'tcx>,
                     Some(config::EntryMain) => {
                         let substs = fcx.tcx.mk_substs(iter::once(Kind::from(ret_ty)));
                         let trait_ref = ty::TraitRef::new(term_id, substs);
+                        let return_ty_span = decl.output.span();
                         let cause = traits::ObligationCause::new(
-                            span, fn_id, ObligationCauseCode::MainFunctionType);
+                            return_ty_span, fn_id, ObligationCauseCode::MainFunctionType);
 
                         inherited.register_predicate(
                             traits::Obligation::new(
diff --git a/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
similarity index 80%
rename from src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
rename to src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
index 5f4ccf2b5862..425f51ca2fb5 100644
--- a/src/test/compile-fail/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.rs
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:`main` can only return types that implement std::process::Termination, not `char
-fn main() -> char {
+fn main() -> char { //~ ERROR
     ' '
 }
diff --git a/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
new file mode 100644
index 000000000000..d09aac3ac2f2
--- /dev/null
+++ b/src/test/ui/rfc-1937-termination-trait/termination-trait-main-wrong-type.stderr
@@ -0,0 +1,11 @@
+error[E0277]: the trait bound `char: std::process::Termination` is not satisfied
+  --> $DIR/termination-trait-main-wrong-type.rs:11:14
+   |
+LL | fn main() -> char { //~ ERROR
+   |              ^^^^ `main` can only return types that implement std::process::Termination, not `char`
+   |
+   = help: the trait `std::process::Termination` is not implemented for `char`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.