diff options
| author | bors <bors@rust-lang.org> | 2023-05-25 00:33:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-25 00:33:43 +0000 |
| commit | 7664dfe4331265d0b2b1ffb89c92d443886bec0b (patch) | |
| tree | 09c5b7ca62f2202c566ff9a70760ce4284646506 /compiler/rustc_data_structures/src | |
| parent | 096309e6dc4378e175e524e963332d1a3830ed63 (diff) | |
| parent | 8038606bf32df8595811176e7299ef88133f9c92 (diff) | |
| download | rust-7664dfe4331265d0b2b1ffb89c92d443886bec0b.tar.gz rust-7664dfe4331265d0b2b1ffb89c92d443886bec0b.zip | |
Auto merge of #111925 - Manishearth:rollup-z6z6l2v, r=Manishearth
Rollup of 5 pull requests Successful merges: - #111741 (Use `ObligationCtxt` in custom type ops) - #111840 (Expose more information in `get_body_with_borrowck_facts`) - #111876 (Roll compiler_builtins to 0.1.92) - #111912 (Use `Option::is_some_and` and `Result::is_ok_and` in the compiler ) - #111915 (libtest: Improve error when missing `-Zunstable-options`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_data_structures/src')
| -rw-r--r-- | compiler/rustc_data_structures/src/obligation_forest/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_data_structures/src/obligation_forest/mod.rs b/compiler/rustc_data_structures/src/obligation_forest/mod.rs index 27a869eb7cd..a47908648ba 100644 --- a/compiler/rustc_data_structures/src/obligation_forest/mod.rs +++ b/compiler/rustc_data_structures/src/obligation_forest/mod.rs @@ -366,7 +366,7 @@ impl<O: ForestObligation> ObligationForest<O> { && self .error_cache .get(&obligation_tree_id) - .map_or(false, |errors| errors.contains(v.key())); + .is_some_and(|errors| errors.contains(v.key())); if already_failed { Err(()) |