about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-12-11 04:33:02 +0900
committerGitHub <noreply@github.com>2019-12-11 04:33:02 +0900
commit2af31dafc7bfdf88b73a1bd1aa8a882a1ff0b609 (patch)
tree54a847ee98dd46f03f4b29cc90b011ea3160f154
parent9af3eec9a6174d911d692bfe2faa1815fd6c3640 (diff)
parent2183a949a8293eb328259374653e76199494b0ea (diff)
downloadrust-2af31dafc7bfdf88b73a1bd1aa8a882a1ff0b609.tar.gz
rust-2af31dafc7bfdf88b73a1bd1aa8a882a1ff0b609.zip
Rollup merge of #67168 - ryanswilson59:master, r=Dylan-DPC
corrected comment in E0478

I believe this fixes the issue that I opened,  https://github.com/rust-lang/rust/issues/67040, about E0478 being contradictory.
-rw-r--r--src/librustc_error_codes/error_codes/E0478.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc_error_codes/error_codes/E0478.md b/src/librustc_error_codes/error_codes/E0478.md
index 6634d9b6e63..4bc5fde2e89 100644
--- a/src/librustc_error_codes/error_codes/E0478.md
+++ b/src/librustc_error_codes/error_codes/E0478.md
@@ -21,8 +21,8 @@ this issue, you need to specify it:
 ```
 trait Wedding<'t>: 't { }
 
-struct Prince<'kiss, 'SnowWhite: 'kiss> { // You say here that 'kiss must live
-                                          // longer than 'SnowWhite.
+struct Prince<'kiss, 'SnowWhite: 'kiss> { // You say here that 'SnowWhite
+                                          // must live longer than 'kiss.
     child: Box<Wedding<'kiss> + 'SnowWhite>, // And now it's all good!
 }
 ```