diff options
| author | bors <bors@rust-lang.org> | 2025-04-18 13:49:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-18 13:49:17 +0000 |
| commit | 191df20fcad9331d3a948aa8e8556775ec3fe69d (patch) | |
| tree | f74fb63b5aa5487852469be80310c79a9ff95f2f /src/librustdoc/json/conversions.rs | |
| parent | 6a0bd27619a997ba7f040a28a41c3511423a3117 (diff) | |
| parent | 8cb57ed74bcd58b0499e5f9dd5e39cbef804d83f (diff) | |
| download | rust-191df20fcad9331d3a948aa8e8556775ec3fe69d.tar.gz rust-191df20fcad9331d3a948aa8e8556775ec3fe69d.zip | |
Auto merge of #139996 - matthiaskrgr:rollup-0nka2hw, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #138528 (deref patterns: implement implicit deref patterns) - #139393 (rustdoc-json: Output target feature information) - #139553 (sync::mpsc: prevent double free on `Drop`) - #139615 (Remove `name_or_empty`) - #139853 (Disable combining LLD with external llvm-config) - #139913 (rustdoc/clean: Fix lowering of fn params (fixes correctness & HIR vs. middle parity regressions)) - #139942 (Ignore aix for tests/ui/erros/pic-linker.rs) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/json/conversions.rs')
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index 5d85a4676b7..dab23f8e42a 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -609,11 +609,12 @@ impl FromClean<clean::FnDecl> for FunctionSignature { let clean::FnDecl { inputs, output, c_variadic } = decl; FunctionSignature { inputs: inputs - .values .into_iter() - // `_` is the most sensible name for missing param names. - .map(|arg| { - (arg.name.unwrap_or(kw::Underscore).to_string(), arg.type_.into_json(renderer)) + .map(|param| { + // `_` is the most sensible name for missing param names. + let name = param.name.unwrap_or(kw::Underscore).to_string(); + let type_ = param.type_.into_json(renderer); + (name, type_) }) .collect(), output: if output.is_unit() { None } else { Some(output.into_json(renderer)) }, |
