Skip to content

Commit 68c0f9f

Browse files
WaffleLapkinWaffleLapkin
committed
Use .mk().* instead of .mk_* part 0
1 parent 31c89e0 commit 68c0f9f

File tree

172 files changed

+1030
-966
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+1030
-966
lines changed

‎compiler/rustc_borrowck/src/diagnostics/bound_region_errors.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ trait TypeOpInfo<'tcx> {
180180
return;
181181
};
182182

183-
let placeholder_region = tcx.mk_re_placeholder(ty::Placeholder {
183+
let placeholder_region = tcx.mk().re_placeholder(ty::Placeholder {
184184
name: placeholder.name,
185185
universe: adjusted_universe.into(),
186186
});
@@ -190,7 +190,7 @@ trait TypeOpInfo<'tcx> {
190190
let adjusted_universe =
191191
error_placeholder.universe.as_u32().checked_sub(base_universe.as_u32());
192192
adjusted_universe.map(|adjusted| {
193-
tcx.mk_re_placeholder(ty::Placeholder {
193+
tcx.mk().re_placeholder(ty::Placeholder {
194194
name: error_placeholder.name,
195195
universe: adjusted.into(),
196196
})
@@ -390,7 +390,7 @@ fn try_extract_error_from_fulfill_cx<'tcx>(
390390
error_region,
391391
&region_constraints,
392392
|vid| ocx.infcx.region_var_origin(vid),
393-
|vid| ocx.infcx.universe_of_region(ocx.infcx.tcx.mk_re_var(vid)),
393+
|vid| ocx.infcx.universe_of_region(ocx.infcx.tcx.mk().re_var(vid)),
394394
)
395395
}
396396

@@ -411,7 +411,7 @@ fn try_extract_error_from_region_constraints<'tcx>(
411411
}
412412
// FIXME: Should this check the universe of the var?
413413
Constraint::VarSubReg(vid, sup) if sup == placeholder_region => {
414-
Some((infcx.tcx.mk_re_var(vid), cause.clone()))
414+
Some((infcx.tcx.mk().re_var(vid), cause.clone()))
415415
}
416416
_ => None,
417417
}

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
10761076
type_known_to_meet_bound_modulo_regions(
10771077
&infcx,
10781078
self.param_env,
1079-
tcx.mk_imm_ref(tcx.lifetimes.re_erased, tcx.erase_regions(ty)),
1079+
tcx.mk()
1080+
.imm_ref(tcx.lifetimes.re_erased, tcx.erase_regions(ty)),
10801081
def_id,
10811082
DUMMY_SP,
10821083
)
@@ -1153,7 +1154,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11531154
);
11541155
}
11551156
if let Some(clone_trait) = tcx.lang_items().clone_trait()
1156-
&& let trait_ref = tcx.mk_trait_ref(clone_trait, [ty])
1157+
&& let trait_ref = tcx.mk().trait_ref(clone_trait, [ty])
11571158
&& let o = Obligation::new(
11581159
tcx,
11591160
ObligationCause::dummy(),

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
508508
let generic_arg = substs[param_index as usize];
509509
let identity_substs =
510510
InternalSubsts::identity_for_item(self.infcx.tcx, adt.did());
511-
let base_ty = self.infcx.tcx.mk_adt(*adt, identity_substs);
511+
let base_ty = self.infcx.tcx.mk().adt(*adt, identity_substs);
512512
let base_generic_arg = identity_substs[param_index as usize];
513513
let adt_desc = adt.descr();
514514

‎compiler/rustc_borrowck/src/nll.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ fn for_each_region_constraint<'tcx>(
436436
let subject = match req.subject {
437437
ClosureOutlivesSubject::Region(subject) => format!("{:?}", subject),
438438
ClosureOutlivesSubject::Ty(ty) => {
439-
format!("{:?}", ty.instantiate(tcx, |vid| tcx.mk_re_var(vid)))
439+
format!("{:?}", ty.instantiate(tcx, |vid| tcx.mk().re_var(vid)))
440440
}
441441
};
442442
with_msg(&format!("where {}: {:?}", subject, req.outlived_free_region,))?;

‎compiler/rustc_borrowck/src/region_infer/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
11221122
_ => arg.fold_with(self),
11231123
}
11241124
});
1125-
tcx.mk_opaque(def_id, tcx.mk_substs_from_iter(substs))
1125+
tcx.mk().opaque(def_id, tcx.mk().substs_from_iter(substs))
11261126
}
11271127
}
11281128

@@ -1141,7 +1141,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
11411141
.universal_regions_outlived_by(r_scc)
11421142
.filter(|&u_r| !self.universal_regions.is_local_free_region(u_r))
11431143
.find(|&u_r| self.eval_equal(u_r, r_vid))
1144-
.map(|u_r| tcx.mk_re_var(u_r))
1144+
.map(|u_r| tcx.mk().re_var(u_r))
11451145
// In the case of a failure, use `ReErased`. We will eventually
11461146
// return `None` in this case.
11471147
.unwrap_or(tcx.lifetimes.re_erased)
@@ -1338,7 +1338,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
13381338
let vid = self.to_region_vid(r);
13391339
let scc = self.constraint_sccs.scc(vid);
13401340
let repr = self.scc_representatives[scc];
1341-
tcx.mk_re_var(repr)
1341+
tcx.mk().re_var(repr)
13421342
})
13431343
}
13441344

@@ -1762,7 +1762,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
17621762
}
17631763

17641764
// If not, report an error.
1765-
let member_region = infcx.tcx.mk_re_var(member_region_vid);
1765+
let member_region = infcx.tcx.mk().re_var(member_region_vid);
17661766
errors_buffer.push(RegionErrorKind::UnexpectedHiddenRegion {
17671767
span: m_c.definition_span,
17681768
hidden_ty: m_c.hidden_ty,

‎compiler/rustc_borrowck/src/region_infer/opaque_types.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
9292
}
9393
None => {
9494
subst_regions.push(vid);
95-
infcx.tcx.mk_re_error_with_message(
95+
infcx.tcx.mk().re_error_with_message(
9696
concrete_type.span,
9797
"opaque type with non-universal region substs",
9898
)
@@ -288,7 +288,7 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
288288

289289
// Require that the hidden type actually fulfills all the bounds of the opaque type, even without
290290
// the bounds that the function supplies.
291-
let opaque_ty = self.tcx.mk_opaque(def_id.to_def_id(), id_substs);
291+
let opaque_ty = self.tcx.mk().opaque(def_id.to_def_id(), id_substs);
292292
if let Err(err) = ocx.eq(
293293
&ObligationCause::misc(instantiated_ty.span, def_id),
294294
param_env,

‎compiler/rustc_borrowck/src/type_check/mod.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ pub(crate) fn type_check<'mir, 'tcx>(
137137
upvars: &[Upvar<'tcx>],
138138
use_polonius: bool,
139139
) -> MirTypeckResults<'tcx> {
140-
let implicit_region_bound = infcx.tcx.mk_re_var(universal_regions.fr_fn_body);
140+
let implicit_region_bound = infcx.tcx.mk().re_var(universal_regions.fr_fn_body);
141141
let mut constraints = MirTypeckRegionConstraints {
142142
placeholder_indices: PlaceholderIndices::default(),
143143
placeholder_index_to_region: IndexVec::default(),
@@ -669,7 +669,7 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> {
669669
PlaceTy::from_ty(match base_ty.kind() {
670670
ty::Array(inner, _) => {
671671
assert!(!from_end, "array subslices should not use from_end");
672-
tcx.mk_array(*inner, to - from)
672+
tcx.mk().array(*inner, to - from)
673673
}
674674
ty::Slice(..) => {
675675
assert!(from_end, "slice subslices should use from_end");
@@ -1866,7 +1866,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
18661866
// and hence may contain unnormalized results.
18671867
let fn_sig = self.normalize(fn_sig, location);
18681868

1869-
let ty_fn_ptr_from = tcx.mk_fn_ptr(fn_sig);
1869+
let ty_fn_ptr_from = tcx.mk().fn_ptr(fn_sig);
18701870

18711871
if let Err(terr) = self.eq_types(
18721872
*ty,
@@ -1890,7 +1890,8 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
18901890
ty::Closure(_, substs) => substs.as_closure().sig(),
18911891
_ => bug!(),
18921892
};
1893-
let ty_fn_ptr_from = tcx.mk_fn_ptr(tcx.signature_unclosure(sig, *unsafety));
1893+
let ty_fn_ptr_from =
1894+
tcx.mk().fn_ptr(tcx.signature_unclosure(sig, *unsafety));
18941895

18951896
if let Err(terr) = self.eq_types(
18961897
*ty,
@@ -1971,7 +1972,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
19711972
);
19721973

19731974
let outlives_predicate =
1974-
tcx.mk_predicate(Binder::dummy(ty::PredicateKind::Clause(
1975+
tcx.mk().predicate(Binder::dummy(ty::PredicateKind::Clause(
19751976
ty::Clause::TypeOutlives(ty::OutlivesPredicate(self_ty, *region)),
19761977
)));
19771978
self.prove_predicate(

‎compiler/rustc_borrowck/src/universal_regions.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -510,11 +510,11 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
510510
.next_nll_region_var(FR, || RegionCtxt::Free(Symbol::intern("c-variadic")))
511511
.to_region_vid();
512512

513-
let region = self.infcx.tcx.mk_re_var(reg_vid);
513+
let region = self.infcx.tcx.mk().re_var(reg_vid);
514514
let va_list_ty =
515515
self.infcx.tcx.type_of(va_list_did).subst(self.infcx.tcx, &[region.into()]);
516516

517-
unnormalized_input_tys = self.infcx.tcx.mk_type_list_from_iter(
517+
unnormalized_input_tys = self.infcx.tcx.mk().type_list_from_iter(
518518
unnormalized_input_tys.iter().copied().chain(iter::once(va_list_ty)),
519519
);
520520
}
@@ -660,7 +660,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
660660
assert_eq!(self.mir_def.did.to_def_id(), def_id);
661661
let closure_sig = substs.as_closure().sig();
662662
let inputs_and_output = closure_sig.inputs_and_output();
663-
let bound_vars = tcx.mk_bound_variable_kinds_from_iter(
663+
let bound_vars = tcx.mk().bound_variable_kinds_from_iter(
664664
inputs_and_output
665665
.bound_vars()
666666
.iter()
@@ -670,7 +670,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
670670
var: ty::BoundVar::from_usize(bound_vars.len() - 1),
671671
kind: ty::BrEnv,
672672
};
673-
let env_region = tcx.mk_re_late_bound(ty::INNERMOST, br);
673+
let env_region = tcx.mk().re_late_bound(ty::INNERMOST, br);
674674
let closure_ty = tcx.closure_env_ty(def_id, substs, env_region).unwrap();
675675

676676
// The "inputs" of the closure in the
@@ -684,7 +684,7 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
684684
};
685685

686686
ty::Binder::bind_with_vars(
687-
tcx.mk_type_list_from_iter(
687+
tcx.mk().type_list_from_iter(
688688
iter::once(closure_ty).chain(inputs).chain(iter::once(output)),
689689
),
690690
bound_vars,
@@ -695,9 +695,9 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
695695
assert_eq!(self.mir_def.did.to_def_id(), def_id);
696696
let resume_ty = substs.as_generator().resume_ty();
697697
let output = substs.as_generator().return_ty();
698-
let generator_ty = tcx.mk_generator(def_id, substs, movability);
698+
let generator_ty = tcx.mk().generator(def_id, substs, movability);
699699
let inputs_and_output =
700-
self.infcx.tcx.mk_type_list(&[generator_ty, resume_ty, output]);
700+
self.infcx.tcx.mk().type_list(&[generator_ty, resume_ty, output]);
701701
ty::Binder::dummy(inputs_and_output)
702702
}
703703

@@ -713,13 +713,13 @@ impl<'cx, 'tcx> UniversalRegionsBuilder<'cx, 'tcx> {
713713
assert_eq!(self.mir_def.did.to_def_id(), def_id);
714714
let ty = tcx.type_of(self.mir_def.def_id_for_type_of()).subst_identity();
715715
let ty = indices.fold_to_region_vids(tcx, ty);
716-
ty::Binder::dummy(tcx.mk_type_list(&[ty]))
716+
ty::Binder::dummy(tcx.mk().type_list(&[ty]))
717717
}
718718

719719
DefiningTy::InlineConst(def_id, substs) => {
720720
assert_eq!(self.mir_def.did.to_def_id(), def_id);
721721
let ty = substs.as_inline_const().ty();
722-
ty::Binder::dummy(tcx.mk_type_list(&[ty]))
722+
ty::Binder::dummy(tcx.mk().type_list(&[ty]))
723723
}
724724
}
725725
}
@@ -793,7 +793,7 @@ impl<'cx, 'tcx> InferCtxtExt<'tcx> for BorrowckInferCtxt<'cx, 'tcx> {
793793
{
794794
let (value, _map) = self.tcx.replace_late_bound_regions(value, |br| {
795795
debug!(?br);
796-
let liberated_region = self.tcx.mk_re_free(all_outlive_scope.to_def_id(), br.kind);
796+
let liberated_region = self.tcx.mk().re_free(all_outlive_scope.to_def_id(), br.kind);
797797
let region_vid = {
798798
let name = match br.kind.get_name() {
799799
Some(name) => name,
@@ -912,7 +912,7 @@ impl<'tcx> UniversalRegionIndices<'tcx> {
912912
where
913913
T: TypeFoldable<TyCtxt<'tcx>>,
914914
{
915-
tcx.fold_regions(value, |region, _| tcx.mk_re_var(self.to_region_vid(region)))
915+
tcx.fold_regions(value, |region, _| tcx.mk().re_var(self.to_region_vid(region)))
916916
}
917917
}
918918

@@ -952,7 +952,7 @@ fn for_each_late_bound_region_in_item<'tcx>(
952952

953953
for bound_var in tcx.late_bound_vars(tcx.hir().local_def_id_to_hir_id(mir_def_id)) {
954954
let ty::BoundVariableKind::Region(bound_region) = bound_var else { continue; };
955-
let liberated_region = tcx.mk_re_free(mir_def_id.to_def_id(), bound_region);
955+
let liberated_region = tcx.mk().re_free(mir_def_id.to_def_id(), bound_region);
956956
f(liberated_region);
957957
}
958958
}

‎compiler/rustc_codegen_llvm/src/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ impl<'ll, 'tcx> FnAbiLlvmExt<'ll, 'tcx> for FnAbi<'tcx, Ty<'tcx>> {
351351
continue;
352352
}
353353
PassMode::Indirect { attrs: _, extra_attrs: Some(_), on_stack: _ } => {
354-
let ptr_ty = cx.tcx.mk_mut_ptr(arg.layout.ty);
354+
let ptr_ty = cx.tcx.mk().mut_ptr(arg.layout.ty);
355355
let ptr_layout = cx.layout_of(ptr_ty);
356356
llargument_tys.push(ptr_layout.scalar_pair_element_llvm_type(cx, 0, true));
357357
llargument_tys.push(ptr_layout.scalar_pair_element_llvm_type(cx, 1, true));

‎compiler/rustc_codegen_llvm/src/coverageinfo/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,17 +190,17 @@ fn declare_unused_fn<'tcx>(cx: &CodegenCx<'_, 'tcx>, def_id: DefId) -> Instance<
190190
if let ty::GenericParamDefKind::Lifetime = param.kind {
191191
tcx.lifetimes.re_erased.into()
192192
} else {
193-
tcx.mk_param_from_def(param)
193+
tcx.mk().param_from_def(param)
194194
}
195195
}),
196196
);
197197

198198
let llfn = cx.declare_fn(
199199
tcx.symbol_name(instance).name,
200200
cx.fn_abi_of_fn_ptr(
201-
ty::Binder::dummy(tcx.mk_fn_sig(
202-
[tcx.mk_unit()],
203-
tcx.mk_unit(),
201+
ty::Binder::dummy(tcx.mk().fn_sig(
202+
[tcx.mk().unit()],
203+
tcx.mk().unit(),
204204
false,
205205
hir::Unsafety::Unsafe,
206206
Abi::Rust,

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,15 @@ fn build_pointer_or_reference_di_node<'ll, 'tcx>(
169169
// a (fat) pointer. Make sure it is not called for e.g. `Box<T, NonZSTAllocator>`.
170170
debug_assert_eq!(
171171
cx.size_and_align_of(ptr_type),
172-
cx.size_and_align_of(cx.tcx.mk_mut_ptr(pointee_type))
172+
cx.size_and_align_of(cx.tcx.mk().mut_ptr(pointee_type))
173173
);
174174

175175
let pointee_type_di_node = type_di_node(cx, pointee_type);
176176

177177
return_if_di_node_created_in_meantime!(cx, unique_type_id);
178178

179179
let (thin_pointer_size, thin_pointer_align) =
180-
cx.size_and_align_of(cx.tcx.mk_imm_ptr(cx.tcx.types.unit));
180+
cx.size_and_align_of(cx.tcx.mk().imm_ptr(cx.tcx.types.unit));
181181
let ptr_type_debuginfo_name = compute_debuginfo_type_name(cx.tcx, ptr_type, true);
182182

183183
match fat_pointer_kind(cx, pointee_type) {
@@ -225,8 +225,11 @@ fn build_pointer_or_reference_di_node<'ll, 'tcx>(
225225
// at all and instead emit regular struct debuginfo for it. We just
226226
// need to make sure that we don't break existing debuginfo consumers
227227
// by doing that (at least not without a warning period).
228-
let layout_type =
229-
if ptr_type.is_box() { cx.tcx.mk_mut_ptr(pointee_type) } else { ptr_type };
228+
let layout_type = if ptr_type.is_box() {
229+
cx.tcx.mk().mut_ptr(pointee_type)
230+
} else {
231+
ptr_type
232+
};
230233

231234
let layout = cx.layout_of(layout_type);
232235
let addr_field = layout.field(cx, abi::FAT_PTR_ADDR);
@@ -1331,7 +1334,7 @@ fn build_vtable_type_di_node<'ll, 'tcx>(
13311334

13321335
// All function pointers are described as opaque pointers. This could be improved in the future
13331336
// by describing them as actual function pointers.
1334-
let void_pointer_ty = tcx.mk_imm_ptr(tcx.types.unit);
1337+
let void_pointer_ty = tcx.mk().imm_ptr(tcx.types.unit);
13351338
let void_pointer_type_di_node = type_di_node(cx, void_pointer_ty);
13361339
let usize_di_node = type_di_node(cx, tcx.types.usize);
13371340
let (pointer_size, pointer_align) = cx.size_and_align_of(void_pointer_ty);

‎compiler/rustc_codegen_llvm/src/debuginfo/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ impl<'ll, 'tcx> DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx> {
433433
ty::Array(ct, _)
434434
if (*ct == cx.tcx.types.u8) || cx.layout_of(*ct).is_zst() =>
435435
{
436-
cx.tcx.mk_imm_ptr(*ct)
436+
cx.tcx.mk().imm_ptr(*ct)
437437
}
438438
_ => t,
439439
};

‎compiler/rustc_codegen_llvm/src/debuginfo/utils.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ pub(crate) fn fat_pointer_kind<'ll, 'tcx>(
8282
ty::Foreign(_) => {
8383
// Assert that pointers to foreign types really are thin:
8484
debug_assert_eq!(
85-
cx.size_of(cx.tcx.mk_imm_ptr(pointee_tail_ty)),
86-
cx.size_of(cx.tcx.mk_imm_ptr(cx.tcx.types.u8))
85+
cx.size_of(cx.tcx.mk().imm_ptr(pointee_tail_ty)),
86+
cx.size_of(cx.tcx.mk().imm_ptr(cx.tcx.types.u8))
8787
);
8888
None
8989
}

‎compiler/rustc_codegen_llvm/src/intrinsic.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -796,25 +796,25 @@ fn get_rust_try_fn<'ll, 'tcx>(
796796

797797
// Define the type up front for the signature of the rust_try function.
798798
let tcx = cx.tcx;
799-
let i8p = tcx.mk_mut_ptr(tcx.types.i8);
799+
let i8p = tcx.mk().mut_ptr(tcx.types.i8);
800800
// `unsafe fn(*mut i8) -> ()`
801-
let try_fn_ty = tcx.mk_fn_ptr(ty::Binder::dummy(tcx.mk_fn_sig(
801+
let try_fn_ty = tcx.mk().fn_ptr(ty::Binder::dummy(tcx.mk().fn_sig(
802802
[i8p],
803-
tcx.mk_unit(),
803+
tcx.mk().unit(),
804804
false,
805805
hir::Unsafety::Unsafe,
806806
Abi::Rust,
807807
)));
808808
// `unsafe fn(*mut i8, *mut i8) -> ()`
809-
let catch_fn_ty = tcx.mk_fn_ptr(ty::Binder::dummy(tcx.mk_fn_sig(
809+
let catch_fn_ty = tcx.mk().fn_ptr(ty::Binder::dummy(tcx.mk().fn_sig(
810810
[i8p, i8p],
811-
tcx.mk_unit(),
811+
tcx.mk().unit(),
812812
false,
813813
hir::Unsafety::Unsafe,
814814
Abi::Rust,
815815
)));
816816
// `unsafe fn(unsafe fn(*mut i8) -> (), *mut i8, unsafe fn(*mut i8, *mut i8) -> ()) -> i32`
817-
let rust_fn_sig = ty::Binder::dummy(cx.tcx.mk_fn_sig(
817+
let rust_fn_sig = ty::Binder::dummy(cx.tcx.mk().fn_sig(
818818
[try_fn_ty, i8p, catch_fn_ty],
819819
tcx.types.i32,
820820
false,

0 commit comments

Comments
 (0)