Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix into() cast paren check precedence #47702

Merged
merged 1 commit into from
Jan 25, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/librustc_typeck/check/demand.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use rustc::infer::InferOk;
use rustc::traits::ObligationCause;

use syntax::ast;
use syntax::util::parser::AssocOp;
use syntax::util::parser::PREC_POSTFIX;
use syntax_pos::{self, Span};
use rustc::hir;
use rustc::hir::print;
Expand Down Expand Up @@ -336,7 +336,7 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
// For now, don't suggest casting with `as`.
let can_cast = false;

let needs_paren = expr.precedence().order() < (AssocOp::As.precedence() as i8);
let needs_paren = expr.precedence().order() < (PREC_POSTFIX as i8);

if let Ok(src) = self.tcx.sess.codemap().span_to_snippet(expr.span) {
let msg = format!("you can cast an `{}` to `{}`", checked_ty, expected_ty);
Expand Down
5 changes: 5 additions & 0 deletions src/test/ui/suggestions/numeric-cast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -312,4 +312,9 @@ fn main() {
foo::<f32>(x_f64);
//~^ ERROR mismatched types
foo::<f32>(x_f32);

foo::<u32>(x_u8 as u16);
//~^ ERROR mismatched types
foo::<i32>(-x_i8);
//~^ ERROR mismatched types
}
22 changes: 21 additions & 1 deletion src/test/ui/suggestions/numeric-cast.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -882,5 +882,25 @@ error[E0308]: mismatched types
312 | foo::<f32>(x_f64);
| ^^^^^ expected f32, found f64

error: aborting due to 132 previous errors
error[E0308]: mismatched types
--> $DIR/numeric-cast.rs:316:16
|
316 | foo::<u32>(x_u8 as u16);
| ^^^^^^^^^^^ expected u32, found u16
help: you can cast an `u16` to `u32`, which will zero-extend the source value
|
316 | foo::<u32>((x_u8 as u16).into());
| ^^^^^^^^^^^^^^^^^^^^

error[E0308]: mismatched types
--> $DIR/numeric-cast.rs:318:16
|
318 | foo::<i32>(-x_i8);
| ^^^^^ expected i32, found i8
help: you can cast an `i8` to `i32`, which will sign-extend the source value
|
318 | foo::<i32>((-x_i8).into());
| ^^^^^^^^^^^^^^

error: aborting due to 134 previous errors