diff options
| author | bors <bors@rust-lang.org> | 2024-09-14 16:18:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-14 16:18:12 +0000 |
| commit | 5fe0e40e05f2d0408c6a292b160f96d595aedfbc (patch) | |
| tree | ec012b7fe5ec3a55d979f5f8ce97a3dbdad94d41 /src/librustdoc/html | |
| parent | e7386b361dda8c2222bee7a1ae79faba7e9a0351 (diff) | |
| parent | 2b40fdbb28009e8f23f34169c6f5579a037eaec5 (diff) | |
| download | rust-5fe0e40e05f2d0408c6a292b160f96d595aedfbc.tar.gz rust-5fe0e40e05f2d0408c6a292b160f96d595aedfbc.zip | |
Auto merge of #130357 - fmease:rollup-j3ej4q0, r=fmease
Rollup of 6 pull requests Successful merges: - #130017 (coverage: Extract `executor::block_on` from several async coverage tests) - #130268 (simd_shuffle: require index argument to be a vector) - #130290 (Stabilize entry_insert) - #130294 (Lifetime cleanups) - #130343 (docs: Enable required feature for 'closure_returning_async_block' lint) - #130349 (Fix `Parser::break_up_float`'s right span) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc/html')
| -rw-r--r-- | src/librustdoc/html/render/search_index.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/librustdoc/html/render/search_index.rs b/src/librustdoc/html/render/search_index.rs index b84c22ac746..86b719c46e8 100644 --- a/src/librustdoc/html/render/search_index.rs +++ b/src/librustdoc/html/render/search_index.rs @@ -847,7 +847,7 @@ enum SimplifiedParam { /// /// This function also works recursively. #[instrument(level = "trace", skip(tcx, res, rgen, cache))] -fn simplify_fn_type<'tcx, 'a>( +fn simplify_fn_type<'a, 'tcx>( self_: Option<&'a Type>, generics: &Generics, arg: &'a Type, @@ -1192,7 +1192,7 @@ fn simplify_fn_type<'tcx, 'a>( } } -fn simplify_fn_constraint<'tcx, 'a>( +fn simplify_fn_constraint<'a, 'tcx>( self_: Option<&'a Type>, generics: &Generics, constraint: &'a clean::AssocItemConstraint, |