bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove unnecessary CVarArgs name skipping logic

Browse source
This commit is contained in:
DaniPopes 2023-10-25 17:44:17 +02:00
parent 2c1dbed4aa
commit 6aead74ff2
No known key found for this signature in database
GPG key ID: 0F09640DDB7AC692
2 changed files with 2 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_ast_lowering/src/lib.rs
View file

@ -1737,14 +1737,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
} }
fn lower_fn_params_to_names(&mut self, decl: &FnDecl) -> &'hir [Ident] { fn lower_fn_params_to_names(&mut self, decl: &FnDecl) -> &'hir [Ident] {
// Skip the `...` (`CVarArgs`) trailing arguments from the AST, self.arena.alloc_from_iter(decl.inputs.iter().map(|param| match param.pat.kind {
// as they are not explicit in HIR/Ty function signatures.
// (instead, the `c_variadic` flag is set to `true`)
let mut inputs = &decl.inputs[..];
if decl.c_variadic() {
inputs = &inputs[..inputs.len() - 1];
}
self.arena.alloc_from_iter(inputs.iter().map(|param| match param.pat.kind {
PatKind::Ident(_, ident, _) => self.lower_ident(ident), PatKind::Ident(_, ident, _) => self.lower_ident(ident),
_ => Ident::new(kw::Empty, self.lower_span(param.pat.span)), _ => Ident::new(kw::Empty, self.lower_span(param.pat.span)),
})) }))

2
tests/pretty/hir-fn-variadic.pp
View file

@ -9,7 +9,7 @@ use ::std::prelude::rust_2015::*;
extern crate std; extern crate std;
extern "C" { extern "C" {
fn foo(x: i32, ...); fn foo(x: i32, va1: ...);
} }
unsafe extern "C" fn bar(_: i32, mut va2: ...) -> usize { va2.arg::<usize>() } unsafe extern "C" fn bar(_: i32, mut va2: ...) -> usize { va2.arg::<usize>() }