diff options
| author | lcnr <rust@lcnr.de> | 2022-07-20 13:34:53 +0200 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2022-07-20 13:34:53 +0200 |
| commit | b81e74ceb7229fbfdd9283ac671a23357b5e6cf1 (patch) | |
| tree | a9bfe5cb44b23aba913326c447120031a2bc697a | |
| parent | c12f5fc006cab3c8276d186545bef4ab99db3673 (diff) | |
| download | rust-b81e74ceb7229fbfdd9283ac671a23357b5e6cf1.tar.gz rust-b81e74ceb7229fbfdd9283ac671a23357b5e6cf1.zip | |
remove `commit_unconditionally`
| -rw-r--r-- | compiler/rustc_infer/src/infer/mod.rs | 12 | ||||
| -rw-r--r-- | compiler/rustc_typeck/src/check/coercion.rs | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/compiler/rustc_infer/src/infer/mod.rs b/compiler/rustc_infer/src/infer/mod.rs index b3dc2e586d2..a551abf58d1 100644 --- a/compiler/rustc_infer/src/infer/mod.rs +++ b/compiler/rustc_infer/src/infer/mod.rs @@ -813,18 +813,6 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> { self.inner.borrow_mut().commit(undo_snapshot); } - /// Executes `f` and commit the bindings. - #[instrument(skip(self, f), level = "debug")] - pub fn commit_unconditionally<R, F>(&self, f: F) -> R - where - F: FnOnce(&CombinedSnapshot<'a, 'tcx>) -> R, - { - let snapshot = self.start_snapshot(); - let r = f(&snapshot); - self.commit_from(snapshot); - r - } - /// Execute `f` and commit the bindings if closure `f` returns `Ok(_)`. #[instrument(skip(self, f), level = "debug")] pub fn commit_if_ok<T, E, F>(&self, f: F) -> Result<T, E> diff --git a/compiler/rustc_typeck/src/check/coercion.rs b/compiler/rustc_typeck/src/check/coercion.rs index 9c9a2096ae9..0a61674517b 100644 --- a/compiler/rustc_typeck/src/check/coercion.rs +++ b/compiler/rustc_typeck/src/check/coercion.rs @@ -737,7 +737,7 @@ impl<'f, 'tcx> Coerce<'f, 'tcx> { F: FnOnce(Ty<'tcx>) -> Vec<Adjustment<'tcx>>, G: FnOnce(Ty<'tcx>) -> Vec<Adjustment<'tcx>>, { - self.commit_unconditionally(|snapshot| { + self.commit_if_ok(|snapshot| { let result = if let ty::FnPtr(fn_ty_b) = b.kind() && let (hir::Unsafety::Normal, hir::Unsafety::Unsafe) = (fn_ty_a.unsafety(), fn_ty_b.unsafety()) |