From 82803fd9bdb4f7e016b43f430ad043cdbdc452e8 Mon Sep 17 00:00:00 2001
From: varkor <github@varkor.com>
Date: Sat, 23 Jun 2018 22:33:36 +0100
Subject: [PATCH] Add backticks to E0558

---
 src/librustc_codegen_llvm/diagnostics.rs | 5 -----
 src/librustc_typeck/collect.rs           | 2 +-
 src/librustc_typeck/diagnostics.rs       | 2 +-
 src/test/ui/error-codes/E0558.stderr     | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/librustc_codegen_llvm/diagnostics.rs b/src/librustc_codegen_llvm/diagnostics.rs
index 57cc33d09bb..94776f17c79 100644
--- a/src/librustc_codegen_llvm/diagnostics.rs
+++ b/src/librustc_codegen_llvm/diagnostics.rs
@@ -48,8 +48,3 @@ unsafe { simd_add(i32x2(0, 0), i32x2(1, 2)); } // ok!
 "##,
 
 }
-
-
-register_diagnostics! {
-    E0558
-}
diff --git a/src/librustc_typeck/collect.rs b/src/librustc_typeck/collect.rs
index 3d66768c24a..c24e20c5699 100644
--- a/src/librustc_typeck/collect.rs
+++ b/src/librustc_typeck/collect.rs
@@ -1909,7 +1909,7 @@ fn codegen_fn_attrs<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>, id: DefId) -> Codegen
                 codegen_fn_attrs.export_name = Some(s);
             } else {
                 struct_span_err!(tcx.sess, attr.span, E0558,
-                                 "export_name attribute has invalid format")
+                                 "`export_name` attribute has invalid format")
                     .span_label(attr.span, "did you mean #[export_name=\"*\"]?")
                     .emit();
             }
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index 75ff17241aa..cdfbb770718 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -3709,7 +3709,7 @@ The `export_name` attribute was malformed.
 Erroneous code example:
 
 ```ignore (error-emitted-at-codegen-which-cannot-be-handled-by-compile_fail)
-#[export_name] // error: export_name attribute has invalid format
+#[export_name] // error: `export_name` attribute has invalid format
 pub fn something() {}
 
 fn main() {}
diff --git a/src/test/ui/error-codes/E0558.stderr b/src/test/ui/error-codes/E0558.stderr
index 0cb8af99294..0777c44058f 100644
--- a/src/test/ui/error-codes/E0558.stderr
+++ b/src/test/ui/error-codes/E0558.stderr
@@ -1,4 +1,4 @@
-error[E0558]: export_name attribute has invalid format
+error[E0558]: `export_name` attribute has invalid format
   --> $DIR/E0558.rs:11:1
    |
 LL | #[export_name]