diff options
| -rw-r--r-- | compiler/rustc_hir_analysis/src/check/intrinsicck.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_hir_analysis/src/collect/type_of.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_hir_analysis/src/check/intrinsicck.rs b/compiler/rustc_hir_analysis/src/check/intrinsicck.rs index 6ea8e838d5c..847a1e64706 100644 --- a/compiler/rustc_hir_analysis/src/check/intrinsicck.rs +++ b/compiler/rustc_hir_analysis/src/check/intrinsicck.rs @@ -466,7 +466,7 @@ impl<'a, 'tcx> InlineAsmCtxt<'a, 'tcx> { hir::InlineAsmOperand::SymFn { anon_const } => { debug_assert!(matches!( self.tcx.type_of(anon_const.def_id).instantiate_identity().kind(), - ty::Error(_) | ty::Never | ty::FnDef(..) + ty::Error(_) | ty::FnDef(..) )); } // AST lowering guarantees that SymStatic points to a static. diff --git a/compiler/rustc_hir_analysis/src/collect/type_of.rs b/compiler/rustc_hir_analysis/src/collect/type_of.rs index a0d438caf8f..001b2190fc7 100644 --- a/compiler/rustc_hir_analysis/src/collect/type_of.rs +++ b/compiler/rustc_hir_analysis/src/collect/type_of.rs @@ -65,7 +65,7 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> { let ty = tcx.typeck(def_id).node_type(hir_id); match ty.kind() { - ty::Never | ty::Error(_) => ty, + ty::Error(_) => ty, ty::FnDef(..) => ty, _ => { tcx.dcx() @@ -80,7 +80,7 @@ fn anon_const_type_of<'tcx>(tcx: TyCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx> { Ty::new_error_with_message( tcx, span, - format!("invalid type for `const` operand"), + format!("invalid type for `sym` operand"), ) } } |
