-
Notifications
You must be signed in to change notification settings - Fork 13.9k
Improvement for comparision against fn #59798
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
Merged
Merged
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
89eac91
Improvement for comparision against fn
rchaser53 aeb1e39
Merge remote-tracking branch 'origin/master'
rchaser53 cbcbd2c
create add_type_neq_err_label
rchaser53 199b0ba
improve error messages
rchaser53 d01ac0d
add the logic for when other_ty is FnDef
rchaser53 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
use super::{FnCtxt, Needs}; | ||
use super::method::MethodCallee; | ||
use rustc::ty::{self, Ty, TypeFoldable}; | ||
use rustc::ty::TyKind::{Ref, Adt, Str, Uint, Never, Tuple, Char, Array}; | ||
use rustc::ty::TyKind::{Ref, Adt, FnDef, Str, Uint, Never, Tuple, Char, Array}; | ||
use rustc::ty::adjustment::{Adjustment, Adjust, AllowTwoPhase, AutoBorrow, AutoBorrowMutability}; | ||
use rustc::infer::type_variable::TypeVariableOrigin; | ||
use errors::{self,Applicability}; | ||
|
@@ -333,8 +333,18 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { | |
lhs_ty); | ||
|
||
if !lhs_expr.span.eq(&rhs_expr.span) { | ||
err.span_label(lhs_expr.span, lhs_ty.to_string()); | ||
err.span_label(rhs_expr.span, rhs_ty.to_string()); | ||
self.add_type_neq_err_label(&mut err, | ||
lhs_expr.span, | ||
lhs_ty, | ||
rhs_ty, | ||
op, | ||
is_assign); | ||
self.add_type_neq_err_label(&mut err, | ||
rhs_expr.span, | ||
rhs_ty, | ||
lhs_ty, | ||
op, | ||
is_assign); | ||
} | ||
|
||
let mut suggested_deref = false; | ||
|
@@ -415,6 +425,48 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { | |
(lhs_ty, rhs_ty, return_ty) | ||
} | ||
|
||
fn add_type_neq_err_label( | ||
&self, | ||
err: &mut errors::DiagnosticBuilder<'_>, | ||
span: Span, | ||
ty: Ty<'tcx>, | ||
other_ty: Ty<'tcx>, | ||
op: hir::BinOp, | ||
is_assign: IsAssign, | ||
) { | ||
err.span_label(span, ty.to_string()); | ||
if let FnDef(def_id, _) = ty.sty { | ||
let source_map = self.tcx.sess.source_map(); | ||
let hir_id = &self.tcx.hir().as_local_hir_id(def_id).unwrap(); | ||
let fn_sig = { | ||
match self.tcx.typeck_tables_of(def_id).liberated_fn_sigs().get(*hir_id) { | ||
Some(f) => f.clone(), | ||
None => { | ||
bug!("No fn-sig entry for def_id={:?}", def_id); | ||
} | ||
} | ||
}; | ||
|
||
if self.lookup_op_method(fn_sig.output(), | ||
&[other_ty], | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could have another code branch for the case where both |
||
Op::Binary(op, is_assign)) | ||
.is_ok() { | ||
let variable_snippet = if fn_sig.inputs().len() > 0 { | ||
format!("{}( /* arguments */ )", source_map.span_to_snippet(span).unwrap()) | ||
} else { | ||
format!("{}()", source_map.span_to_snippet(span).unwrap()) | ||
}; | ||
|
||
err.span_suggestion( | ||
span, | ||
"did you forget", | ||
estebank marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
variable_snippet, | ||
Applicability::MachineApplicable, | ||
estebank marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
); | ||
} | ||
} | ||
estebank marked this conversation as resolved.
Show resolved
Hide resolved
|
||
} | ||
|
||
fn check_str_addition( | ||
&self, | ||
expr: &'gcx hir::Expr, | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// ignore-tidy-linelength | ||
|
||
fn foo() -> i32 { | ||
42 | ||
} | ||
|
||
fn bar(a: i64) -> i64 { | ||
43 | ||
} | ||
|
||
fn main() { | ||
foo > 12; | ||
//~^ ERROR 12:9: 12:10: binary operation `>` cannot be applied to type `fn() -> i32 {foo}` [E0369] | ||
//~| ERROR 12:11: 12:13: mismatched types [E0308] | ||
|
||
bar > 13; | ||
//~^ ERROR 16:9: 16:10: binary operation `>` cannot be applied to type `fn(i64) -> i64 {bar}` [E0369] | ||
//~| ERROR 16:11: 16:13: mismatched types [E0308] | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
error[E0369]: binary operation `>` cannot be applied to type `fn() -> i32 {foo}` | ||
--> $DIR/issue-59488.rs:12:9 | ||
| | ||
LL | foo > 12; | ||
| --- ^ -- {integer} | ||
| | | ||
| fn() -> i32 {foo} | ||
| help: did you forget: `foo()` | ||
| | ||
= note: an implementation of `std::cmp::PartialOrd` might be missing for `fn() -> i32 {foo}` | ||
|
||
error[E0308]: mismatched types | ||
--> $DIR/issue-59488.rs:12:11 | ||
| | ||
LL | foo > 12; | ||
| ^^ expected fn item, found integer | ||
| | ||
= note: expected type `fn() -> i32 {foo}` | ||
found type `i32` | ||
|
||
error[E0369]: binary operation `>` cannot be applied to type `fn(i64) -> i64 {bar}` | ||
--> $DIR/issue-59488.rs:16:9 | ||
| | ||
LL | bar > 13; | ||
| --- ^ -- {integer} | ||
| | | ||
| fn(i64) -> i64 {bar} | ||
| help: did you forget: `bar( /* arguments */ )` | ||
| | ||
= note: an implementation of `std::cmp::PartialOrd` might be missing for `fn(i64) -> i64 {bar}` | ||
|
||
error[E0308]: mismatched types | ||
--> $DIR/issue-59488.rs:16:11 | ||
| | ||
LL | bar > 13; | ||
| ^^ expected fn item, found integer | ||
| | ||
= note: expected type `fn(i64) -> i64 {bar}` | ||
found type `i64` | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
Some errors occurred: E0308, E0369. | ||
For more information about an error, try `rustc --explain E0308`. |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.