Skip to content

Commit

Permalink
Auto merge of rust-lang#41786 - acdenisSK:an_to_a, r=frewsxcv
Browse files Browse the repository at this point in the history
Fix "an" usage

Since the pr i reviewed on got merged way before the author had a chance to quickly change it, i just did it myself. (Or well, someone else asked me to, if you want me to be honest)
  • Loading branch information
bors committed May 6, 2017
2 parents 2cf6af1 + bb34a3e commit c1a960a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ after_failure:

# Save tagged docker images we created and load them if they're available
# Travis saves caches whether the build failed or not, nuke rustsrc if
# the failure was while updating it (as it may be in an bad state)
# the failure was while updating it (as it may be in a bad state)
# https://github.com/travis-ci/travis-ci/issues/4472
before_cache:
- docker history -q rust-ci |
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/parse/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,7 @@ impl<'a> Parser<'a> {
let (span, e) = self.interpolated_or_expr_span(e)?;
let span_of_tilde = lo;
let mut err = self.diagnostic().struct_span_err(span_of_tilde,
"`~` can not be used as an unary operator");
"`~` can not be used as a unary operator");
err.span_label(span_of_tilde, &"did you mean `!`?");
err.help("use `!` instead of `~` if you meant to perform bitwise negation");
err.emit();
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/did_you_mean/issue-41679.stderr
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
error: `~` can not be used as an unary operator
error: `~` can not be used as a unary operator
--> $DIR/issue-41679.rs:12:13
|
12 | let x = ~1;
Expand Down

0 comments on commit c1a960a

Please sign in to comment.