about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-11-27 06:04:18 -0600
committerGitHub <noreply@github.com>2016-11-27 06:04:18 -0600
commit0e17ba5ffcc72fc38722a56618be712ef3607013 (patch)
treedab04bb1df327037d09e9b5b0bceb00c003f5b22
parentf3930aab46c1ea470c8c2a2d7d6832174630596d (diff)
parent984c039e4e08ab28dca9bec2fa20baf4c0f4452a (diff)
downloadrust-0e17ba5ffcc72fc38722a56618be712ef3607013.tar.gz
rust-0e17ba5ffcc72fc38722a56618be712ef3607013.zip
Auto merge of #38007 - alygin:err-expl-fix, r=eddyb
Fix error explanation formatting

Errors E0101, E0458, E0535 and E0537 have incorrectly formatted bulleted lists in their explanations. As the result, they are not rendered as lists in the documentation.

The fix applies the correct formatting to those lists.
-rw-r--r--src/librustc_metadata/diagnostics.rs2
-rw-r--r--src/librustc_typeck/diagnostics.rs1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/librustc_metadata/diagnostics.rs b/src/librustc_metadata/diagnostics.rs
index b2f4760727a..6cf1a9e8a39 100644
--- a/src/librustc_metadata/diagnostics.rs
+++ b/src/librustc_metadata/diagnostics.rs
@@ -56,9 +56,11 @@ An unknown "kind" was specified for a link attribute. Erroneous code example:
 ```
 
 Please specify a valid "kind" value, from one of the following:
+
  * static
  * dylib
  * framework
+
 "##,
 
 E0459: r##"
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs
index f5432c6e0fc..04314045733 100644
--- a/src/librustc_typeck/diagnostics.rs
+++ b/src/librustc_typeck/diagnostics.rs
@@ -1377,6 +1377,7 @@ let x = |_| {}; // error: cannot determine a type for this expression
 ```
 
 You have two possibilities to solve this situation:
+
  * Give an explicit definition of the expression
  * Infer the expression