diff options
| author | lcnr <rust@lcnr.de> | 2023-07-03 09:24:02 +0200 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2023-07-03 09:24:02 +0200 |
| commit | be6a344365337afced33fcfd86773367aa8fbf98 (patch) | |
| tree | 33d82c6e1dd04a0c9018490912efc6f126d01e4a | |
| parent | 30ed152330637774354f6450d49bd193a1b59dcf (diff) | |
| download | rust-be6a344365337afced33fcfd86773367aa8fbf98.tar.gz rust-be6a344365337afced33fcfd86773367aa8fbf98.zip | |
rebase
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/fulfill.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_trait_selection/src/solve/normalize.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/solve/fulfill.rs b/compiler/rustc_trait_selection/src/solve/fulfill.rs index d883e487716..88ee14c4db5 100644 --- a/compiler/rustc_trait_selection/src/solve/fulfill.rs +++ b/compiler/rustc_trait_selection/src/solve/fulfill.rs @@ -41,7 +41,7 @@ impl<'tcx> FulfillmentCtxt<'tcx> { } impl<'tcx> TraitEngine<'tcx> for FulfillmentCtxt<'tcx> { - #[instrument(level = "debug", skip(self, _infcx))] + #[instrument(level = "debug", skip(self, infcx))] fn register_predicate_obligation( &mut self, infcx: &InferCtxt<'tcx>, diff --git a/compiler/rustc_trait_selection/src/solve/normalize.rs b/compiler/rustc_trait_selection/src/solve/normalize.rs index 1084e7acfeb..d2eed10950f 100644 --- a/compiler/rustc_trait_selection/src/solve/normalize.rs +++ b/compiler/rustc_trait_selection/src/solve/normalize.rs @@ -20,7 +20,7 @@ pub(crate) fn deeply_normalize<'tcx, T: TypeFoldable<TyCtxt<'tcx>>>( at: At<'_, 'tcx>, value: T, ) -> Result<T, Vec<FulfillmentError<'tcx>>> { - let fulfill_cx = FulfillmentCtxt::new(); + let fulfill_cx = FulfillmentCtxt::new(at.infcx); let mut folder = NormalizationFolder { at, fulfill_cx, depth: 0, universes: Vec::new() }; value.try_fold_with(&mut folder) |