diff options
| author | bors <bors@rust-lang.org> | 2024-12-24 03:33:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-24 03:33:09 +0000 |
| commit | d3e71fd2d3cf68addac558a807c9ba83f6217a64 (patch) | |
| tree | 371816eeebc7bd1535b418d550fa23180422cbc4 /compiler/rustc_error_codes | |
| parent | f3343420c813a3dad6746e274137ba51bf97f063 (diff) | |
| parent | 772b95e7554194dfbb04aaee65fcd983d0b84221 (diff) | |
| download | rust-d3e71fd2d3cf68addac558a807c9ba83f6217a64.tar.gz rust-d3e71fd2d3cf68addac558a807c9ba83f6217a64.zip | |
Auto merge of #134716 - Zalathar:rollup-1h4q8cc, r=Zalathar
Rollup of 5 pull requests
Successful merges:
- #134638 (Fix effect predicates from item bounds in old solver)
- #134662 (Fix safety docs for `dyn Any + Send {+ Sync}`)
- #134689 (core: fix const ptr::swap_nonoverlapping when there are pointers at odd offsets)
- #134699 (Belay new reviews for workingjubilee)
- #134701 (Correctly note item kind in `NonConstFunctionCall` error message)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0015.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0015.md b/compiler/rustc_error_codes/src/error_codes/E0015.md index ac78f66adad..244cc476243 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0015.md +++ b/compiler/rustc_error_codes/src/error_codes/E0015.md @@ -7,7 +7,7 @@ fn create_some() -> Option<u8> { Some(1) } -// error: cannot call non-const fn `create_some` in constants +// error: cannot call non-const function `create_some` in constants const FOO: Option<u8> = create_some(); ``` |