diff options
| author | bors <bors@rust-lang.org> | 2025-02-24 10:27:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-24 10:27:53 +0000 |
| commit | bb029a1d3f819471722f32dd9fcfa2c83d4f24f4 (patch) | |
| tree | fd4e4c3896ac33d634b549c77d2ad062cccea875 /compiler/rustc_codegen_ssa/src/errors.rs | |
| parent | f43e549b88698568581a9d329c7582e3708ac187 (diff) | |
| parent | 42014b44b3d91e6567bb666f02c37ba537af00d0 (diff) | |
| download | rust-bb029a1d3f819471722f32dd9fcfa2c83d4f24f4.tar.gz rust-bb029a1d3f819471722f32dd9fcfa2c83d4f24f4.zip | |
Auto merge of #137511 - jhpratt:rollup-07whsax, r=jhpratt
Rollup of 10 pull requests
Successful merges:
- #136610 (Allow `IndexSlice` to be indexed by ranges.)
- #136991 ([rustdoc] Add new setting to wrap source code lines when too long)
- #137061 (Unstable `gen_future` Feature Tracking )
- #137393 (Stabilize `unbounded_shifts`)
- #137482 (Windows: use existing wrappers in `File::open_native`)
- #137484 (Fix documentation for unstable sort on slice)
- #137491 (Tighten `str-to-string-128690.rs``CHECK{,-NOT}`s to make it less likely to incorrectly fail with symbol name mangling)
- #137495 (Added into_value function to ControlFlow<T, T>)
- #137501 (Move `impl` blocks out of `rustc_middle/src/mir/syntax.rs`)
- #137505 (Add a span to `CompilerBuiltinsCannotCall`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/errors.rs')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/errors.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/rustc_codegen_ssa/src/errors.rs b/compiler/rustc_codegen_ssa/src/errors.rs index 3ddbe4aeeec..5e25de02a77 100644 --- a/compiler/rustc_codegen_ssa/src/errors.rs +++ b/compiler/rustc_codegen_ssa/src/errors.rs @@ -1180,6 +1180,8 @@ pub(crate) struct ErrorCreatingRemarkDir { pub struct CompilerBuiltinsCannotCall { pub caller: String, pub callee: String, + #[primary_span] + pub span: Span, } #[derive(Diagnostic)] |