From 5d52ef5091b8e993477fff36efd4cc6f2df33491 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Mon, 26 Mar 2018 22:04:27 +0200
Subject: [PATCH] Add tests and longer error explanation

---
 src/libsyntax_ext/diagnostics.rs              | 25 ++++++++++++++++++-
 .../issue-21045.rs => ui/E0660.rs}            |  5 ++--
 src/test/ui/E0660.stderr                      | 15 +++++++++++
 src/test/ui/E0661.rs                          | 16 ++++++++++++
 src/test/ui/E0661.stderr                      |  9 +++++++
 5 files changed, 67 insertions(+), 3 deletions(-)
 rename src/test/{compile-fail/issue-21045.rs => ui/E0660.rs} (79%)
 create mode 100644 src/test/ui/E0660.stderr
 create mode 100644 src/test/ui/E0661.rs
 create mode 100644 src/test/ui/E0661.stderr

diff --git a/src/libsyntax_ext/diagnostics.rs b/src/libsyntax_ext/diagnostics.rs
index e247a22aeb07..a840c0392e9f 100644
--- a/src/libsyntax_ext/diagnostics.rs
+++ b/src/libsyntax_ext/diagnostics.rs
@@ -1,4 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// 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.
 //
@@ -15,8 +15,31 @@
 // In vim you can `:set tw=80` and use `gq` to wrap paragraphs. Use `:set tw=0` to disable.
 register_long_diagnostics! {
 E0660: r##"
+The argument to the `asm` macro is not well-formed.
+
+Erroneous code example:
+
+```compile_fail,E0660
+asm!("nop" "nop");
+```
+
+Considering that this would be a long explanation, we instead recommend you to
+take a look at the unstable book:
+https://doc.rust-lang.org/unstable-book/language-features/asm.html
 "##,
 
 E0661: r##"
+An invalid syntax was passed to the second argument of an `asm` macro line.
+
+Erroneous code example:
+
+```compile_fail,E0661
+let a;
+asm!("nop" : "r"(a));
+```
+
+Considering that this would be a long explanation, we instead recommend you to
+take a look at the unstable book:
+https://doc.rust-lang.org/unstable-book/language-features/asm.html
 "##,
 }
diff --git a/src/test/compile-fail/issue-21045.rs b/src/test/ui/E0660.rs
similarity index 79%
rename from src/test/compile-fail/issue-21045.rs
rename to src/test/ui/E0660.rs
index 134240f8c8aa..dbea0c8e7d84 100644
--- a/src/test/compile-fail/issue-21045.rs
+++ b/src/test/ui/E0660.rs
@@ -7,10 +7,11 @@
 // <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(asm)]
 
 fn main() {
     let a;
-    asm!("nop" "nop"); //~ ERROR malformed inline assembly
-    asm!("nop" "nop" : "=r"(a)); //~ ERROR malformed inline assembly
+    asm!("nop" "nop");
+    asm!("nop" "nop" : "=r"(a));
 }
diff --git a/src/test/ui/E0660.stderr b/src/test/ui/E0660.stderr
new file mode 100644
index 000000000000..0ef8fc464879
--- /dev/null
+++ b/src/test/ui/E0660.stderr
@@ -0,0 +1,15 @@
+error[E0660]: malformed inline assembly
+  --> $DIR/E0660.rs:15:5
+   |
+LL |     asm!("nop" "nop");
+   |     ^^^^^^^^^^^^^^^^^^
+
+error[E0660]: malformed inline assembly
+  --> $DIR/E0660.rs:16:5
+   |
+LL |     asm!("nop" "nop" : "=r"(a));
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0660`.
diff --git a/src/test/ui/E0661.rs b/src/test/ui/E0661.rs
new file mode 100644
index 000000000000..be932a0d471d
--- /dev/null
+++ b/src/test/ui/E0661.rs
@@ -0,0 +1,16 @@
+// 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(asm)]
+
+fn main() {
+    let a;
+    asm!("nop" : "r"(a));
+}
diff --git a/src/test/ui/E0661.stderr b/src/test/ui/E0661.stderr
new file mode 100644
index 000000000000..90aeca5612ae
--- /dev/null
+++ b/src/test/ui/E0661.stderr
@@ -0,0 +1,9 @@
+error[E0661]: output operand constraint lacks '=' or '+'
+  --> $DIR/E0661.rs:15:18
+   |
+LL |     asm!("nop" : "r"(a));
+   |                  ^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0661`.