Skip to content

Commit

Permalink
Rollup merge of rust-lang#34160 - hoodie:bug/GoT_References, r=Guilla…
Browse files Browse the repository at this point in the history
…umeGomez

Fixed two little Game Of Thrones References

Fixed: conflicting spelling of "Jon Snow"
Fixed: It's call "Night's Watch"
  • Loading branch information
sanxiyn committed Jun 10, 2016
2 parents a9aa284 + 92e8228 commit 9638804
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/librustc_typeck/diagnostics.rs
Expand Up @@ -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
Expand All @@ -1184,16 +1184,16 @@ two solutions. Either you add variants in your enum:
```
#[repr(i32)]
enum NightWatch {
JohnSnow,
enum NightsWatch {
JonSnow,
Commander,
}
```
or you remove the integer represention of your enum:
```
enum NightWatch {}
enum NightsWatch {}
```
"##,

Expand Down

0 comments on commit 9638804

Please sign in to comment.