diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-12 12:41:55 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-12 12:41:55 +0000 |
commit | 6149ee30ef9a379f642c8a645cea13f32c4f3d84 (patch) | |
tree | 5e62cbb2356383b36a36ae717a99f628580da60c /crates/ra_hir/src/ty/infer | |
parent | f5e1b0f97c9e46b5186f99d744f4587b2aee397e (diff) | |
parent | 30bf7e43db2667470875ea4477a95aa297896851 (diff) |
Merge #2221
2221: Disallow regressing crate docs r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/ty/infer')
-rw-r--r-- | crates/ra_hir/src/ty/infer/expr.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/ty/infer/expr.rs b/crates/ra_hir/src/ty/infer/expr.rs index 4af1d65ee..6d9792391 100644 --- a/crates/ra_hir/src/ty/infer/expr.rs +++ b/crates/ra_hir/src/ty/infer/expr.rs | |||
@@ -452,8 +452,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> { | |||
452 | Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type) | 452 | Ty::apply_one(TypeCtor::Ref(Mutability::Shared), slice_type) |
453 | } | 453 | } |
454 | Literal::Char(..) => Ty::simple(TypeCtor::Char), | 454 | Literal::Char(..) => Ty::simple(TypeCtor::Char), |
455 | Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int(*ty)), | 455 | Literal::Int(_v, ty) => Ty::simple(TypeCtor::Int((*ty).into())), |
456 | Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float(*ty)), | 456 | Literal::Float(_v, ty) => Ty::simple(TypeCtor::Float((*ty).into())), |
457 | }, | 457 | }, |
458 | }; | 458 | }; |
459 | // use a new type variable if we got Ty::Unknown here | 459 | // use a new type variable if we got Ty::Unknown here |