From 44c686113fe93bb67ac2dcb1db500b5b8cbf0b6a Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Mon, 12 Feb 2018 23:21:20 +0100
Subject: Add error codes for libsyntax_ext

---
 src/libsyntax_ext/asm.rs         | 16 ++++++++++++++--
 src/libsyntax_ext/diagnostics.rs | 22 ++++++++++++++++++++++
 src/libsyntax_ext/lib.rs         |  5 +++++
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 src/libsyntax_ext/diagnostics.rs

(limited to 'src/libsyntax_ext')

diff --git a/src/libsyntax_ext/asm.rs b/src/libsyntax_ext/asm.rs
index d1de4dccd00..e1eabc5cb01 100644
--- a/src/libsyntax_ext/asm.rs
+++ b/src/libsyntax_ext/asm.rs
@@ -45,6 +45,17 @@ impl State {
     }
 }
 
+macro_rules! span_err_if_not_stage0 {
+    ($cx:expr, $sp:expr, $code:ident, $text:tt) => {
+        #[cfg(not(stage0))] {
+            span_err!($cx, $sp, $code, $text)
+        }
+        #[cfg(stage0)] {
+            $cx.span_err($sp, $text)
+        }
+    }
+}
+
 const OPTIONS: &'static [&'static str] = &["volatile", "alignstack", "intel"];
 
 pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt,
@@ -89,7 +100,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt,
                 if asm_str_style.is_some() {
                     // If we already have a string with instructions,
                     // ending up in Asm state again is an error.
-                    cx.span_err(sp, "malformed inline assembly");
+                    span_err_if_not_stage0!(cx, sp, E0660, "malformed inline assembly");
                     return DummyResult::expr(sp);
                 }
                 // Nested parser, stop before the first colon (see above).
@@ -142,7 +153,8 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt,
                             Some(Symbol::intern(&format!("={}", ch.as_str())))
                         }
                         _ => {
-                            cx.span_err(span, "output operand constraint lacks '=' or '+'");
+                            span_err_if_not_stage0!(cx, span, E0661,
+                                                    "output operand constraint lacks '=' or '+'");
                             None
                         }
                     };
diff --git a/src/libsyntax_ext/diagnostics.rs b/src/libsyntax_ext/diagnostics.rs
new file mode 100644
index 00000000000..e247a22aeb0
--- /dev/null
+++ b/src/libsyntax_ext/diagnostics.rs
@@ -0,0 +1,22 @@
+// Copyright 2014 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.
+
+#![allow(non_snake_case)]
+
+// Error messages for EXXXX errors.
+// Each message should start and end with a new line, and be wrapped to 80 characters.
+// In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
+register_long_diagnostics! {
+E0660: r##"
+"##,
+
+E0661: r##"
+"##,
+}
diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs
index 97e34c554d1..39ad594e5c5 100644
--- a/src/libsyntax_ext/lib.rs
+++ b/src/libsyntax_ext/lib.rs
@@ -18,6 +18,8 @@
 #![feature(decl_macro)]
 #![feature(str_escape)]
 
+#![cfg_attr(not(stage0), feature(rustc_diagnostic_macros))]
+
 extern crate fmt_macros;
 #[macro_use]
 extern crate syntax;
@@ -26,6 +28,9 @@ extern crate proc_macro;
 extern crate rustc_data_structures;
 extern crate rustc_errors as errors;
 
+#[cfg(not(stage0))]
+mod diagnostics;
+
 mod assert;
 mod asm;
 mod cfg;
-- 
cgit 1.4.1-3-g733a5