diff options
| author | bors <bors@rust-lang.org> | 2022-03-12 09:30:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-03-12 09:30:06 +0000 |
| commit | f8a29bd95e0427ea1a46412ee2bb48e92644edc9 (patch) | |
| tree | fa384834798c5b1335d4363613088dd0d89bb06a /src/librustdoc | |
| parent | 012720ffb075a087b781325d17d1822a340a2f2a (diff) | |
| parent | 49e0137a158ac72ac84918b287ac3d8a8a991990 (diff) | |
Auto merge of #94875 - matthiaskrgr:rollup-tq1li2d, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #94150 (rustdoc-json: Include GenericParamDefKind::Type::synthetic in JSON) - #94833 ([2/2] Implement macro meta-variable expression) - #94863 (Remove redundant slicing of whole ranges in `bootstrap`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/librustdoc')
| -rw-r--r-- | src/librustdoc/json/conversions.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs index 4358dc8980f..7ffcfada5c0 100644 --- a/src/librustdoc/json/conversions.rs +++ b/src/librustdoc/json/conversions.rs @@ -340,9 +340,10 @@ impl FromWithTcx<clean::GenericParamDefKind> for GenericParamDefKind { Lifetime { outlives } => GenericParamDefKind::Lifetime { outlives: outlives.into_iter().map(|lt| lt.0.to_string()).collect(), }, - Type { did: _, bounds, default, synthetic: _ } => GenericParamDefKind::Type { + Type { did: _, bounds, default, synthetic } => GenericParamDefKind::Type { bounds: bounds.into_iter().map(|x| x.into_tcx(tcx)).collect(), default: default.map(|x| (*x).into_tcx(tcx)), + synthetic, }, Const { did: _, ty, default } => { GenericParamDefKind::Const { ty: (*ty).into_tcx(tcx), default: default.map(|x| *x) } |