Skip to content

Commit 9e4fd58

Browse files
committed
gaming
1 parent 16fe19b commit 9e4fd58

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

compiler/rustc_hir_typeck/src/opaque_types.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
4848
) => continue,
4949
}
5050

51+
// TODO
5152
if hidden_type.ty.has_non_region_infer() {
52-
let guar =
53-
tcx.dcx().span_err(hidden_type.span, "non-defining use in the defining scope");
54-
typeck_results
55-
.concrete_opaque_types
56-
.insert(opaque_type_key.def_id, OpaqueHiddenType::new_error(tcx, guar));
57-
self.set_tainted_by_errors(guar);
53+
continue;
5854
}
5955

6056
let hidden_type = hidden_type.remap_generic_params_to_declaration_params(

compiler/rustc_infer/src/infer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ impl<'tcx> InferCtxt<'tcx> {
961961

962962
pub fn find_sup_as_registered_opaque(&self, ty_vid: TyVid) -> Option<ty::AliasTy<'tcx>> {
963963
let ty_sub_vid = self.sub_root_var(ty_vid);
964-
let opaques = self.inner.borrow().opaque_type_storage.opaque_types.clone();
964+
let opaques: Vec<_> = self.inner.borrow().opaque_type_storage.iter_opaque_types().collect();
965965
opaques
966966
.into_iter()
967967
.find(|(_, hidden_ty)| {

src/tools/clippy/clippy_utils/src/ty/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ use rustc_middle::traits::EvaluationResult;
2020
use rustc_middle::ty::layout::ValidityRequirement;
2121
use rustc_middle::ty::{
2222
self, AdtDef, AliasTy, AssocItem, AssocTag, Binder, BoundRegion, FnSig, GenericArg, GenericArgKind, GenericArgsRef,
23-
GenericParamDefKind, IntTy, ParamEnv, Region, RegionKind, TraitRef, Ty, TyCtxt, TypeSuperVisitable, TypeVisitable,
24-
TypeVisitableExt, TypeVisitor, UintTy, Upcast, VariantDef, VariantDiscr,
23+
GenericParamDefKind, IntTy, ParamEnv, Region, RegionKind, TraitRef, Ty, TyCtxt, TypeFoldable, TypeSuperVisitable,
24+
TypeVisitable, TypeVisitableExt, TypeVisitor, UintTy, Upcast, VariantDef, VariantDiscr,
2525
};
2626
use rustc_span::symbol::Ident;
2727
use rustc_span::{DUMMY_SP, Span, Symbol, sym};

0 commit comments

Comments
 (0)