diff options
| author | bors <bors@rust-lang.org> | 2024-07-23 19:45:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-23 19:45:09 +0000 |
| commit | 8bfcae730a5db2438bbda72796175bba21427be1 (patch) | |
| tree | c853bd00ed4811a32ab33f9c8b84a1d0b7e6ec7b /compiler/rustc_error_codes/src | |
| parent | 84c257ebe5319ba68ce9a4ce5bca2d89e7127a14 (diff) | |
| parent | 041b8c4447f73322203b97ffb842be3d72b8123b (diff) | |
| download | rust-8bfcae730a5db2438bbda72796175bba21427be1.tar.gz rust-8bfcae730a5db2438bbda72796175bba21427be1.zip | |
Auto merge of #128109 - matthiaskrgr:rollup-gc7kopi, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #125886 (Migrate run make issue 15460) - #126898 (Migrate `run-make/link-framework` to `rmake.rs`) - #126994 (Support lists and stylings in more places for `rustc --explain`) - #127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake) - #128060 (Fix inclusion of `wasm-component-ld` in dist artifacts) - #128082 (Note closure captures when reporting cast to fn ptr failed) - #128098 (make it possible to disable download-rustc if it's incompatible) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0373.md | 2 | ||||
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0378.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0373.md b/compiler/rustc_error_codes/src/error_codes/E0373.md index effa597aad9..d4d26007aa5 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0373.md +++ b/compiler/rustc_error_codes/src/error_codes/E0373.md @@ -70,4 +70,4 @@ fn spawn<F: Future + Send + 'static>(future: F) { Similarly to closures, `async` blocks are not executed immediately and may capture closed-over data by reference. For more information, see -https://rust-lang.github.io/async-book/03_async_await/01_chapter.html. +<https://rust-lang.github.io/async-book/03_async_await/01_chapter.html>. diff --git a/compiler/rustc_error_codes/src/error_codes/E0378.md b/compiler/rustc_error_codes/src/error_codes/E0378.md index c6fe997f3dc..7d939b99b04 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0378.md +++ b/compiler/rustc_error_codes/src/error_codes/E0378.md @@ -20,7 +20,7 @@ where The `DispatchFromDyn` trait currently can only be implemented for builtin pointer types and structs that are newtype wrappers around them -— that is, the struct must have only one field (except for`PhantomData`), +— that is, the struct must have only one field (except for `PhantomData`), and that field must itself implement `DispatchFromDyn`. ``` |