From 177337d5cc97db43c09be1521133886c67a94c86 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Sun, 1 Apr 2018 00:10:34 +0200
Subject: [PATCH 1/2] Stabilize short error format

---
 src/librustc/session/config.rs    | 14 +-------------
 src/test/ui/short-error-format.rs |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 35538e5d02a23..cc8e8c7c31c20 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1799,19 +1799,7 @@ pub fn build_session_options_and_crate_config(
             Some("human") => ErrorOutputType::HumanReadable(color),
             Some("json") => ErrorOutputType::Json(false),
             Some("pretty-json") => ErrorOutputType::Json(true),
-            Some("short") => {
-                if nightly_options::is_unstable_enabled(matches) {
-                    ErrorOutputType::Short(color)
-                } else {
-                    early_error(
-                        ErrorOutputType::default(),
-                        &format!(
-                            "the `-Z unstable-options` flag must also be passed to \
-                             enable the short error message option"
-                        ),
-                    );
-                }
-            }
+            Some("short") => ErrorOutputType::Short(color),
             None => ErrorOutputType::HumanReadable(color),
 
             Some(arg) => early_error(
diff --git a/src/test/ui/short-error-format.rs b/src/test/ui/short-error-format.rs
index ecce824ca178b..3e6802c51c3a6 100644
--- a/src/test/ui/short-error-format.rs
+++ b/src/test/ui/short-error-format.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// compile-flags: --error-format=short -Zunstable-options
+// compile-flags: --error-format=short
 
 fn foo(_: u32) {}
 

From 426b63f8a3aed16b293a34345714c13c836e9276 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Thu, 3 May 2018 23:18:49 +0200
Subject: [PATCH 2/2] Make short-error format GNU compatible

---
 src/librustc_errors/emitter.rs        | 2 +-
 src/test/ui/short-error-format.stderr | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
index 4d1d33e1325b8..f65acf08c86d8 100644
--- a/src/librustc_errors/emitter.rs
+++ b/src/librustc_errors/emitter.rs
@@ -1047,7 +1047,7 @@ impl EmitterWriter {
                     }
                 } else {
                     buffer.prepend(0,
-                                   &format!("{}:{}:{} - ",
+                                   &format!("{}:{}:{}: ",
                                             loc.file.name,
                                             cm.doctest_offset_line(loc.line),
                                             loc.col.0 + 1),
diff --git a/src/test/ui/short-error-format.stderr b/src/test/ui/short-error-format.stderr
index debe60b463226..f7461b837bdc1 100644
--- a/src/test/ui/short-error-format.stderr
+++ b/src/test/ui/short-error-format.stderr
@@ -1,3 +1,3 @@
-$DIR/short-error-format.rs:16:9 - error[E0308]: mismatched types
-$DIR/short-error-format.rs:18:7 - error[E0599]: no method named `salut` found for type `u32` in the current scope
+$DIR/short-error-format.rs:16:9: error[E0308]: mismatched types
+$DIR/short-error-format.rs:18:7: error[E0599]: no method named `salut` found for type `u32` in the current scope
 error: aborting due to 2 previous errors