From 9416904d148129a6e0315fd139ae5ae516ff104c Mon Sep 17 00:00:00 2001
From: WizardOfMenlo <giacomofenzi@outlook.com>
Date: Mon, 28 Jan 2019 14:52:43 +0000
Subject: [PATCH 1/2] Added support for primitive types type inference when
using std::ops::Not
---
crates/ra_hir/src/ty.rs | 14 +++++--
.../ty/snapshots/tests__infer_unary_op.snap | 37 +++++++++++++------
crates/ra_hir/src/ty/tests.rs | 5 +++
3 files changed, 41 insertions(+), 15 deletions(-)
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 37715a903a4..81cff8c474d 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -1588,9 +1588,17 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
_ => Ty::Unknown,
}
}
- UnaryOp::Not if inner_ty == Ty::Bool => Ty::Bool,
- // TODO: resolve ops::Not trait for inner_ty
- UnaryOp::Not => Ty::Unknown,
+ UnaryOp::Not => {
+ match inner_ty {
+ Ty::Bool
+ | Ty::Int(primitive::UncertainIntTy::Unknown)
+ | Ty::Int(primitive::UncertainIntTy::Signed(..))
+ | Ty::Int(primitive::UncertainIntTy::Unsigned(..))
+ | Ty::Infer(InferTy::IntVar(..)) => inner_ty,
+ // TODO: resolve ops::Not trait for inner_ty
+ _ => Ty::Unknown,
+ }
+ }
}
}
Expr::BinaryOp { lhs, rhs, op } => match op {
diff --git a/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap b/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap
index 10aa6195444..5021d0eeba7 100644
--- a/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap
+++ b/crates/ra_hir/src/ty/snapshots/tests__infer_unary_op.snap
@@ -1,11 +1,11 @@
---
-created: "2019-01-22T14:45:00.059676600+00:00"
-creator: insta@0.4.0
+created: "2019-01-28T14:51:16.185273502+00:00"
+creator: insta@0.5.2
expression: "&result"
-source: "crates\\ra_hir\\src\\ty\\tests.rs"
+source: crates/ra_hir/src/ty/tests.rs
---
[27; 28) 'x': SomeType
-[40; 197) '{ ...lo"; }': ()
+[40; 272) '{ ...lo"; }': ()
[50; 51) 'b': bool
[54; 59) 'false': bool
[69; 70) 'c': bool
@@ -24,12 +24,25 @@ source: "crates\\ra_hir\\src\\ty\\tests.rs"
[147; 153) '!!true': bool
[148; 153) '!true': bool
[149; 153) 'true': bool
-[159; 164) '-3.14': f64
-[160; 164) '3.14': f64
-[170; 172) '-x': [unknown]
-[171; 172) 'x': SomeType
-[178; 180) '!x': [unknown]
-[179; 180) 'x': SomeType
-[186; 194) '-"hello"': [unknown]
-[187; 194) '"hello"': &str
+[163; 164) 'g': i32
+[167; 170) '!42': i32
+[168; 170) '42': i32
+[180; 181) 'h': u32
+[184; 190) '!10u32': u32
+[185; 190) '10u32': u32
+[200; 201) 'j': i128
+[204; 206) '!a': i128
+[205; 206) 'a': i128
+[212; 217) '-3.14': f64
+[213; 217) '3.14': f64
+[223; 225) '!3': i32
+[224; 225) '3': i32
+[231; 233) '-x': [unknown]
+[232; 233) 'x': SomeType
+[239; 241) '!x': [unknown]
+[240; 241) 'x': SomeType
+[247; 255) '-"hello"': [unknown]
+[248; 255) '"hello"': &str
+[261; 269) '!"hello"': [unknown]
+[262; 269) '"hello"': &str
diff --git a/crates/ra_hir/src/ty/tests.rs b/crates/ra_hir/src/ty/tests.rs
index ac12d974b89..b36e6ec47d0 100644
--- a/crates/ra_hir/src/ty/tests.rs
+++ b/crates/ra_hir/src/ty/tests.rs
@@ -166,10 +166,15 @@ fn test(x: SomeType) {
let d: i128 = -a;
let e = -100;
let f = !!!true;
+ let g = !42;
+ let h = !10u32;
+ let j = !a;
-3.14;
+ !3;
-x;
!x;
-"hello";
+ !"hello";
}
"#,
);
From ec32b2e39cb95fc1a9015379de6fe71f230c873d Mon Sep 17 00:00:00 2001
From: WizardOfMenlo <giacomofenzi@outlook.com>
Date: Mon, 28 Jan 2019 17:17:04 +0000
Subject: [PATCH 2/2] Use match-all instead of individual branches
---
crates/ra_hir/src/ty.rs | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/crates/ra_hir/src/ty.rs b/crates/ra_hir/src/ty.rs
index 81cff8c474d..7a548569814 100644
--- a/crates/ra_hir/src/ty.rs
+++ b/crates/ra_hir/src/ty.rs
@@ -1590,11 +1590,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
}
UnaryOp::Not => {
match inner_ty {
- Ty::Bool
- | Ty::Int(primitive::UncertainIntTy::Unknown)
- | Ty::Int(primitive::UncertainIntTy::Signed(..))
- | Ty::Int(primitive::UncertainIntTy::Unsigned(..))
- | Ty::Infer(InferTy::IntVar(..)) => inner_ty,
+ Ty::Bool | Ty::Int(_) | Ty::Infer(InferTy::IntVar(..)) => inner_ty,
// TODO: resolve ops::Not trait for inner_ty
_ => Ty::Unknown,
}