mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Inline one usage of check_expr_eq_type

Browse Source
This commit is contained in:
Michael Goulet 2023-08-03 04:21:18 +00:00
parent f3589a723d
commit a63bb24593
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_hir_typeck/src/expr.rs
View File

@ -60,11 +60,6 @@ use rustc_trait_selection::traits::ObligationCtxt;
use rustc_trait_selection::traits::{self, ObligationCauseCode}; use rustc_trait_selection::traits::{self, ObligationCauseCode};
impl<'a, 'tcx> FnCtxt<'a, 'tcx> { impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
fn check_expr_eq_type(&self, expr: &'tcx hir::Expr<'tcx>, expected: Ty<'tcx>) {
let ty = self.check_expr_with_hint(expr, expected);
self.demand_eqtype(expr.span, expected, ty);
}
pub fn check_expr_has_type_or_error( pub fn check_expr_has_type_or_error(
&self, &self,
expr: &'tcx hir::Expr<'tcx>, expr: &'tcx hir::Expr<'tcx>,
@ -331,9 +326,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
} }
ExprKind::Cast(e, t) => self.check_expr_cast(e, t, expr), ExprKind::Cast(e, t) => self.check_expr_cast(e, t, expr),
ExprKind::Type(e, t) => { ExprKind::Type(e, t) => {
let ty = self.to_ty_saving_user_provided_ty(&t); let ascribed_ty = self.to_ty_saving_user_provided_ty(&t);
self.check_expr_eq_type(&e, ty); let ty = self.check_expr_with_hint(e, ascribed_ty);
ty self.demand_eqtype(e.span, ascribed_ty, ty);
ascribed_ty
} }
ExprKind::If(cond, then_expr, opt_else_expr) => { ExprKind::If(cond, then_expr, opt_else_expr) => {
self.check_then_else(cond, then_expr, opt_else_expr, expr.span, expected) self.check_then_else(cond, then_expr, opt_else_expr, expr.span, expected)