about summary refs log tree commit diff
path: root/compiler/rustc_codegen_llvm/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-10-11 15:01:07 +0000
committerbors <bors@rust-lang.org>2024-10-11 15:01:07 +0000
commitb85f63260795be317af34e85ec645e69622bf4e3 (patch)
tree55cf2d0312a8a0dbf997500354573a03d6eccf40 /compiler/rustc_codegen_llvm/src
parent6f1def79dd372e380357e1dfd2b8a54254ffe2d0 (diff)
parent8c46c498d9a575576d8d8106269cb549830ccf30 (diff)
downloadrust-b85f63260795be317af34e85ec645e69622bf4e3.tar.gz
rust-b85f63260795be317af34e85ec645e69622bf4e3.zip
Auto merge of #13528 - zvavybir:master, r=Alexendoo
Improved wording of or_fun_call lint

The current wording (e.g. ``use of `ok_or` followed by a function call``) is potentially confusing (at least it confused me) by suggesting that the function that follows the (in this case) `ok_or` is the problem and not the function that is an argument to it.

The code in my program that triggered the confusing message is the following:
```rust
let file_id = buf
    .lines()
    .next()
    .ok_or((
        InternalError::ProblemReadingFromInbox,
        anyhow!("No first line in inbox response ({file:?}): {buf:?}"),
    ))
    .html_context(stream, lang)?;
```
I thought that `html_context` was the problem and that I should do something along the following lines:
```rust
let file_id = buf
    .lines()
    .next()
    .ok_or_else(
        (
            InternalError::ProblemReadingFromInbox,
            anyhow!("No first line in inbox response ({file:?}): {buf:?}"),
        ),
        html_context(stream, lang),
    )?
```
This is of course wrong.  My confusion was only cleared up through the help message indicating what I should try instead.

If someone has a better idea of a replacement wording (currently e.g. ``` function call inside of `ok_or` ```), I'm all ears.

changelog: none
Diffstat (limited to 'compiler/rustc_codegen_llvm/src')
0 files changed, 0 insertions, 0 deletions