diff options
| author | bors <bors@rust-lang.org> | 2025-05-02 04:26:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-02 04:26:54 +0000 |
| commit | cb0d6e76d0515b19d249c0147d246296b9d3d124 (patch) | |
| tree | cbc84e7a1a9c4d3f69b400af805e9dad805c9763 /compiler/rustc_error_codes/src | |
| parent | 3350c1eb3fd8fe1bee1ed4c76944d707bd256876 (diff) | |
| parent | d42e3ace2be27a05d8474720025a1e611328ca8b (diff) | |
| download | rust-cb0d6e76d0515b19d249c0147d246296b9d3d124.tar.gz rust-cb0d6e76d0515b19d249c0147d246296b9d3d124.zip | |
Auto merge of #140565 - GuillaumeGomez:rollup-gv4ed14, r=GuillaumeGomez
Rollup of 12 pull requests Successful merges: - #138703 (chore: remove redundant words in comment) - #139186 (Refactor `diy_float`) - #139780 (docs: Add example to `Iterator::take` with `by_ref`) - #139802 (Fix some grammar errors and hyperlinks in doc for `trait Allocator`) - #140034 (simd_select_bitmask: the 'padding' bits in the mask are just ignored) - #140062 (std: mention `remove_dir_all` can emit `DirectoryNotEmpty` when concurrently written into) - #140420 (rustdoc: Fix doctest heuristic for main fn wrapping) - #140460 (Fix handling of LoongArch target features not supported by LLVM 19) - #140538 (rustc-dev-guide subtree update) - #140544 (Clean up "const" situation in format_args!(). ) - #140552 (allow `#[rustc_std_internal_symbol]` in combination with `#[naked]`) - #140556 (Improve error output in case `nodejs` or `npm` is not installed for rustdoc-gui test suite) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0207.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0207.md b/compiler/rustc_error_codes/src/error_codes/E0207.md index 5b35748f472..f80b0093ecc 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0207.md +++ b/compiler/rustc_error_codes/src/error_codes/E0207.md @@ -195,7 +195,7 @@ impl<'a> Contains for Foo { Please note that unconstrained lifetime parameters are not supported if they are being used by an associated type. -In cases where the associated type's lifetime is meant to be tied to the the +In cases where the associated type's lifetime is meant to be tied to the self type, and none of the methods on the trait need ownership or different mutability, then an option is to implement the trait on a borrowed type: |