OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #41786 - acdenisSK:an_to_a, r=frewsxcv

Browse Source 
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)
This commit is contained in:
bors 2017-05-06 19:45:10 +00:00
commit c1a960a031
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -194,7 +194,7 @@ after_failure:
# Save tagged docker images we created and load them if they're available # 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 # 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 # https://github.com/travis-ci/travis-ci/issues/4472
before_cache: before_cache:
- docker history -q rust-ci | - docker history -q rust-ci |

2
src/libsyntax/parse/parser.rs
View File

@ -2707,7 +2707,7 @@ impl<'a> Parser<'a> {
let (span, e) = self.interpolated_or_expr_span(e)?; let (span, e) = self.interpolated_or_expr_span(e)?;
let span_of_tilde = lo; let span_of_tilde = lo;
let mut err = self.diagnostic().struct_span_err(span_of_tilde, 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.span_label(span_of_tilde, &"did you mean `!`?");
err.help("use `!` instead of `~` if you meant to perform bitwise negation"); err.help("use `!` instead of `~` if you meant to perform bitwise negation");
err.emit(); err.emit();

2
src/test/ui/did_you_mean/issue-41679.stderr
View File

@ -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 --> $DIR/issue-41679.rs:12:13
| |
12 | let x = ~1; 12 | let x = ~1;