language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-27 20:42:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

impl Default for BindingMode.

Browse source 
This decouples callers from knowing what the default binding mode of
pattern matching is.
This commit is contained in:
Michael Killough 2019-03-17 18:46:01 +00:00
parent b42c5ced68
commit 354134ffb4
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/ra_hir/src/ty/infer.rs
View file

@ -81,6 +81,12 @@ impl BindingMode {
} }
} }
impl Default for BindingMode {
fn default() -> Self {
BindingMode::Move
}
}
/// The result of type inference: A mapping from expressions and patterns to types. /// The result of type inference: A mapping from expressions and patterns to types.
#[derive(Clone, PartialEq, Eq, Debug)] #[derive(Clone, PartialEq, Eq, Debug)]
pub struct InferenceResult { pub struct InferenceResult {
@ -761,7 +767,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
} }
Expr::For { iterable, body, pat } => { Expr::For { iterable, body, pat } => {
let _iterable_ty = self.infer_expr(*iterable, &Expectation::none()); let _iterable_ty = self.infer_expr(*iterable, &Expectation::none());
self.infer_pat(*pat, &Ty::Unknown, BindingMode::Move); self.infer_pat(*pat, &Ty::Unknown, BindingMode::default());
self.infer_expr(*body, &Expectation::has_type(Ty::unit())); self.infer_expr(*body, &Expectation::has_type(Ty::unit()));
Ty::unit() Ty::unit()
} }
@ -775,7 +781,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
} else { } else {
Ty::Unknown Ty::Unknown
}; };
self.infer_pat(*arg_pat, &expected, BindingMode::Move); self.infer_pat(*arg_pat, &expected, BindingMode::default());
} }
// TODO: infer lambda type etc. // TODO: infer lambda type etc.
@ -865,7 +871,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
for arm in arms { for arm in arms {
for &pat in &arm.pats { for &pat in &arm.pats {
let _pat_ty = self.infer_pat(pat, &input_ty, BindingMode::Move); let _pat_ty = self.infer_pat(pat, &input_ty, BindingMode::default());
} }
if let Some(guard_expr) = arm.guard { if let Some(guard_expr) = arm.guard {
self.infer_expr(guard_expr, &Expectation::has_type(Ty::Bool)); self.infer_expr(guard_expr, &Expectation::has_type(Ty::Bool));
@ -1065,7 +1071,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
decl_ty decl_ty
}; };
self.infer_pat(*pat, &ty, BindingMode::Move); self.infer_pat(*pat, &ty, BindingMode::default());
} }
Statement::Expr(expr) => { Statement::Expr(expr) => {
self.infer_expr(*expr, &Expectation::none()); self.infer_expr(*expr, &Expectation::none());
@ -1081,7 +1087,7 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
for (type_ref, pat) in signature.params().iter().zip(body.params()) { for (type_ref, pat) in signature.params().iter().zip(body.params()) {
let ty = self.make_ty(type_ref); let ty = self.make_ty(type_ref);
self.infer_pat(*pat, &ty, BindingMode::Move); self.infer_pat(*pat, &ty, BindingMode::default());
} }
self.return_ty = self.make_ty(signature.ret_type()); self.return_ty = self.make_ty(signature.ret_type());
} }