about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2015-07-22 12:56:49 -0400
committerSteve Klabnik <steve@steveklabnik.com>2015-07-22 12:56:49 -0400
commitb73c6fe8f263ebcf461bb5790b273d127199028f (patch)
treebefc26b2ba37ef569f31340c746028227f9064a3 /src
parent239657c3778a303e903e8541448618c39101cd4b (diff)
parent3ae7b72970104d1269fd1ebc31aaaf50830f3a3b (diff)
downloadrust-b73c6fe8f263ebcf461bb5790b273d127199028f.tar.gz
rust-b73c6fe8f263ebcf461bb5790b273d127199028f.zip
Rollup merge of #27156 - AlisdairO:diagnostics253, r=Manishearth
This is a resubmission of my previous git failure - apologies.  Just fixing up a wording error that was discovered in E0253 after the r.

r? @Manishearth
Diffstat (limited to 'src')
-rw-r--r--src/librustc_resolve/diagnostics.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 21a95006094..5a941c757fc 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -106,8 +106,7 @@ mod foo {
 use foo::MyTrait::do_something;
 ```
 
-In general, it's not legal to directly import methods belonging to a
-trait or concrete type.
+It's illegal to directly import methods belonging to a trait or concrete type.
 "##,
 
 E0255: r##"