diff options
| author | bors <bors@rust-lang.org> | 2025-04-30 17:15:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-30 17:15:51 +0000 |
| commit | 251cda5e1f0057eb04fd9fc1653f2f1e010e8f97 (patch) | |
| tree | a437ee3fb4d894188f3e7cb395d7c607935434a6 /compiler/rustc_codegen_gcc/src/builder.rs | |
| parent | 7188f453111502962326022740e2657fce0a6939 (diff) | |
| parent | 1e440aecc84b7e208ad14667aac83c963e85cd32 (diff) | |
| download | rust-251cda5e1f0057eb04fd9fc1653f2f1e010e8f97.tar.gz rust-251cda5e1f0057eb04fd9fc1653f2f1e010e8f97.zip | |
Auto merge of #140520 - matthiaskrgr:rollup-7aoqcnp, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #134232 (Share the naked asm impl between cg_ssa and cg_clif) - #139624 (Don't allow flattened format_args in const.) - #140090 (Check bare function idents for non snake-case name) - #140203 (Issue an error when using `no_mangle` on language items) - #140450 (ast: Remove token visiting from AST visitor) - #140498 (Misc tweaks to HIR typeck (mostly w.r.t. checking calls)) - #140504 (transmutability: ensure_sufficient_stack when answering query) - #140506 (unstable-book: fix capitalization) - #140516 (Replace use of rustc_type_ir by rustc_middle) Failed merges: - #140374 (Resolve instance for SymFn in global/naked asm) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/builder.rs')
| -rw-r--r-- | compiler/rustc_codegen_gcc/src/builder.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_gcc/src/builder.rs b/compiler/rustc_codegen_gcc/src/builder.rs index 5c70f4a7df9..6720f6186d1 100644 --- a/compiler/rustc_codegen_gcc/src/builder.rs +++ b/compiler/rustc_codegen_gcc/src/builder.rs @@ -45,7 +45,7 @@ enum ExtremumOperation { Min, } -pub struct Builder<'a: 'gcc, 'gcc, 'tcx> { +pub struct Builder<'a, 'gcc, 'tcx> { pub cx: &'a CodegenCx<'gcc, 'tcx>, pub block: Block<'gcc>, pub location: Option<Location<'gcc>>, |