diff options
| author | Seo Sanghyeon <sanxiyn@gmail.com> | 2016-06-10 21:16:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-10 21:16:45 +0900 |
| commit | 886df542e29760f03e940d0d5a9c5335c360f412 (patch) | |
| tree | fc53f7690165fc8d05213c1f9c1ea08aa6c17f96 | |
| parent | e31210aac3d510b33e8d7384fbe6dc4dda9c0dc1 (diff) | |
| parent | 92e8228813a248520a4c3cadf6457c5225502525 (diff) | |
Rollup merge of #34160 - hoodie:bug/GoT_References, r=GuillaumeGomez
Fixed two little Game Of Thrones References Fixed: conflicting spelling of "Jon Snow" Fixed: It's call "Night's Watch"
| -rw-r--r-- | src/librustc_typeck/diagnostics.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/librustc_typeck/diagnostics.rs b/src/librustc_typeck/diagnostics.rs index 7017cb9f6a2..c0cca08b676 100644 --- a/src/librustc_typeck/diagnostics.rs +++ b/src/librustc_typeck/diagnostics.rs @@ -1174,7 +1174,7 @@ Erroneous code example: ```compile_fail #[repr(i32)] -enum NightWatch {} // error: unsupported representation for zero-variant enum +enum NightsWatch {} // error: unsupported representation for zero-variant enum ``` It is impossible to define an integer type to be used to represent zero-variant @@ -1184,8 +1184,8 @@ two solutions. Either you add variants in your enum: ``` #[repr(i32)] -enum NightWatch { - JohnSnow, +enum NightsWatch { + JonSnow, Commander, } ``` @@ -1193,7 +1193,7 @@ enum NightWatch { or you remove the integer represention of your enum: ``` -enum NightWatch {} +enum NightsWatch {} ``` "##, |