about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-17 15:15:03 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-17 17:26:44 -0800
commitfd5403a37a7a0db53b68d240c1b35d878e617214 (patch)
treecdc2ac0f5d4f122d02632d99db156ec03fad8388
parent6d7a5e709421b05bfc4740697f86511e0737b475 (diff)
parentf71a0ea60b934f2d93b611c66d0b7f1148efb51d (diff)
rollup merge of #22456: steveklabnik/fix_grammar
Noticed in #22429
-rw-r--r--src/librustc/middle/stability.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustc/middle/stability.rs b/src/librustc/middle/stability.rs
index 36bdca8c8e9..0a0f555f977 100644
--- a/src/librustc/middle/stability.rs
+++ b/src/librustc/middle/stability.rs
@@ -261,12 +261,12 @@ impl<'a, 'tcx> Checker<'a, 'tcx> {
                 if self.tcx.sess.features.borrow().unmarked_api {
                     self.tcx.sess.span_warn(span, "use of unmarked library feature");
                     self.tcx.sess.span_note(span, "this is either a bug in the library you are \
-                                                   using and a bug in the compiler - please \
+                                                   using or a bug in the compiler - please \
                                                    report it in both places");
                 } else {
                     self.tcx.sess.span_err(span, "use of unmarked library feature");
                     self.tcx.sess.span_note(span, "this is either a bug in the library you are \
-                                                   using and a bug in the compiler - please \
+                                                   using or a bug in the compiler - please \
                                                    report it in both places");
                     self.tcx.sess.span_note(span, "use #![feature(unmarked_api)] in the \
                                                    crate attributes to override this");