diff options
| author | bors <bors@rust-lang.org> | 2023-01-04 03:37:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-01-04 03:37:21 +0000 |
| commit | c361616c3ca3e3e3069dbdf90557181233387444 (patch) | |
| tree | f2349c433d136fec3ba910e30a55ddcac032894c /compiler/rustc_codegen_gcc | |
| parent | fbe82928729c29ea953c95defb81b302dd704fae (diff) | |
| parent | 1a984435df11fbc69f1f99165a77c6e96357c908 (diff) | |
| download | rust-c361616c3ca3e3e3069dbdf90557181233387444.tar.gz rust-c361616c3ca3e3e3069dbdf90557181233387444.zip | |
Auto merge of #106432 - compiler-errors:rollup-lzj0lnp, r=compiler-errors
Rollup of 8 pull requests Successful merges: - #104748 (Ensure `lld` is supported with `download-ci-llvm`) - #105541 (Simplify some iterator combinators) - #106045 (default OOM handler: use non-unwinding panic, to match std handler) - #106157 (Don't trim path for `unsafe_op_in_unsafe_fn` lints) - #106353 (Reduce spans for `unsafe impl` errors) - #106381 (Jsondoclint: Add `--verbose` and `--json-output` options) - #106411 (rustdoc: remove legacy font-feature-settings CSS) - #106414 (Add cuviper to the review rotation for libs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/builder.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/context.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs index effb2de4827..a92242b2615 100644 --- a/compiler/rustc_codegen_gcc/src/builder.rs +++ b/compiler/rustc_codegen_gcc/src/builder.rs @@ -1244,7 +1244,7 @@ impl<'a, 'gcc, 'tcx> BuilderMethods<'a, 'tcx> for Builder<'a, 'gcc, 'tcx> { ) -> RValue<'gcc> { // FIXME(antoyo): remove when having a proper API. let gcc_func = unsafe { std::mem::transmute(func) }; - let call = if self.functions.borrow().values().find(|value| **value == gcc_func).is_some() { + let call = if self.functions.borrow().values().any(|value| *value == gcc_func) { self.function_call(func, args, funclet) } else { diff --git a/compiler/rustc_codegen_gcc/src/context.rs b/compiler/rustc_codegen_gcc/src/context.rs index 837708aeb0e..4424b31c054 100644 --- a/compiler/rustc_codegen_gcc/src/context.rs +++ b/compiler/rustc_codegen_gcc/src/context.rs @@ -253,7 +253,7 @@ impl<'gcc, 'tcx> CodegenCx<'gcc, 'tcx> { pub fn rvalue_as_function(&self, value: RValue<'gcc>) -> Function<'gcc> { let function: Function<'gcc> = unsafe { std::mem::transmute(value) }; - debug_assert!(self.functions.borrow().values().find(|value| **value == function).is_some(), + debug_assert!(self.functions.borrow().values().any(|value| *value == function), "{:?} ({:?}) is not a function", value, value.get_type()); function } |
