about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-07-31 12:52:41 +0000
committerbors <bors@rust-lang.org>2015-07-31 12:52:41 +0000
commit759726276733a6c63fcb9d5b0ca75128736f8539 (patch)
tree8250488b1bfc66f2dc5f0330b8a3bd3aef2826e8
parenta7b8f5bc47966bc995004f5905f831be4b68d026 (diff)
parent3254ae6a527ddace29d9d740c57fdc6207624cfc (diff)
downloadrust-759726276733a6c63fcb9d5b0ca75128736f8539.tar.gz
rust-759726276733a6c63fcb9d5b0ca75128736f8539.zip
Auto merge of #27431 - GuillaumeGomez:patch-3, r=Manishearth
-rw-r--r--src/librustc_resolve/diagnostics.rs15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 6db4e49e98f..2696ca378f7 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -583,9 +583,10 @@ Please verify you didn't misspell the import's name.
 "##,
 
 E0437: r##"
-Trait impls can only implement associated types that are members of the trait in
-question. This error indicates that you attempted to implement an associated
-type whose name does not match the name of any associated type in the trait.
+Trait implementations can only implement associated types that are members of
+the trait in question. This error indicates that you attempted to implement
+an associated type whose name does not match the name of any associated type
+in the trait.
 
 Here is an example that demonstrates the error:
 
@@ -607,10 +608,10 @@ impl Foo for i32 {}
 "##,
 
 E0438: r##"
-Trait impls can only implement associated constants that are members of the
-trait in question. This error indicates that you attempted to implement an
-associated constant whose name does not match the name of any associated
-constant in the trait.
+Trait implementations can only implement associated constants that are
+members of the trait in question. This error indicates that you
+attempted to implement an associated constant whose name does not
+match the name of any associated constant in the trait.
 
 Here is an example that demonstrates the error: