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

fix new usage of type_of

Browse Source
This commit is contained in:
Kyle Matsuda 2023-02-14 15:34:47 -07:00
parent 8e92849cbb
commit f6c3469aa2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_hir_analysis/src/check/intrinsicck.rs
View File

@ -414,7 +414,7 @@ impl<'a, 'tcx> InlineAsmCtxt<'a, 'tcx> {
// Check that sym actually points to a function. Later passes // Check that sym actually points to a function. Later passes
// depend on this. // depend on this.
hir::InlineAsmOperand::SymFn { anon_const } => { hir::InlineAsmOperand::SymFn { anon_const } => {
let ty = self.tcx.type_of(anon_const.def_id); let ty = self.tcx.type_of(anon_const.def_id).subst_identity();
match ty.kind() { match ty.kind() {
ty::Never | ty::Error(_) => {} ty::Never | ty::Error(_) => {}
ty::FnDef(..) => {} ty::FnDef(..) => {}

2
src/librustdoc/passes/collect_intra_doc_links.rs
View File

@ -1710,7 +1710,7 @@ fn resolution_failure(
Res::Primitive(_) => None, Res::Primitive(_) => None,
}; };
let is_struct_variant = |did| { let is_struct_variant = |did| {
if let ty::Adt(def, _) = tcx.type_of(did).kind() if let ty::Adt(def, _) = tcx.type_of(did).subst_identity().kind()
&& def.is_enum() && def.is_enum()
&& let Some(variant) = def.variants().iter().find(|v| v.name == res.name(tcx)) { && let Some(variant) = def.variants().iter().find(|v| v.name == res.name(tcx)) {
// ctor is `None` if variant is a struct // ctor is `None` if variant is a struct