Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 9 pull requests #98591

Merged
merged 25 commits into from
Jun 28, 2022
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
eff865c
Fix span issues in object safety suggestions
compiler-errors Jun 25, 2022
b094116
interpret: refactor allocation info query
RalfJung Jun 27, 2022
e1b6f16
Fix `rustdoc` argument error
inashivb Sep 10, 2021
ed62a09
Add test for default rustdoc run
inashivb Sep 15, 2021
70ced25
Add test for help output with -W
inashivb Jan 27, 2022
768129d
Finish rustdoc error improvement
GuillaumeGomez Jun 21, 2022
4dbf9ba
outside of borrowck, do not provide an implicit_region_bound
lcnr Jun 27, 2022
70497d9
fold_region: remove unused parameter
lcnr Jun 27, 2022
c1c0d25
Fix kind for associated types in rustdoc JSON output for trait implem…
GuillaumeGomez Jun 27, 2022
9277f95
Add test for associated items in rustdoc JSON
GuillaumeGomez Jun 27, 2022
28fafc4
lower-generic vs. outlive
lcnr Jun 27, 2022
dfb592a
Remove eddyb from miri failure pings
oli-obk Jun 27, 2022
9b497ab
liballoc tests: avoid int2ptr cast
RalfJung Jun 27, 2022
8e73c3e
make AllocKind actually public
RalfJung Jun 27, 2022
8c977cf
libcore tests: avoid int2ptr casts
RalfJung Jun 27, 2022
44e5715
Add triagebot mentions.
ehuss Jun 27, 2022
38bfa9c
Rollup merge of #98331 - GuillaumeGomez:rustdoc-arg-error, r=notriddle
matthiaskrgr Jun 27, 2022
6391f23
Rollup merge of #98506 - compiler-errors:object-safety-suggestions, r…
matthiaskrgr Jun 27, 2022
4f61fe2
Rollup merge of #98563 - RalfJung:interpret-alloc-check, r=oli-obk
matthiaskrgr Jun 27, 2022
9509348
Rollup merge of #98576 - lcnr:region-stuff-cool-beans, r=jackh726
matthiaskrgr Jun 27, 2022
d0ae6eb
Rollup merge of #98577 - GuillaumeGomez:associated-items, r=notriddle
matthiaskrgr Jun 27, 2022
9f66799
Rollup merge of #98578 - rust-lang:oli-obk-patch-1, r=eddyb
matthiaskrgr Jun 27, 2022
b52c362
Rollup merge of #98579 - RalfJung:alloc-tests, r=thomcc
matthiaskrgr Jun 27, 2022
19a05b5
Rollup merge of #98581 - ehuss:triagebot-mentions, r=Mark-Simulacrum
matthiaskrgr Jun 27, 2022
f266821
Rollup merge of #98587 - RalfJung:core-tests, r=thomcc
matthiaskrgr Jun 27, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix kind for associated types in rustdoc JSON output for trait implem…
…entations
  • Loading branch information
GuillaumeGomez committed Jun 27, 2022
commit c1c0d2593987a604fa0842ebd0b6515d9213883e
7 changes: 5 additions & 2 deletions src/librustdoc/json/conversions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,11 @@ fn from_clean_item(item: clean::Item, tcx: TyCtxt<'_>) -> ItemEnum {
bounds: b.into_iter().map(|x| x.into_tcx(tcx)).collect(),
default: None,
},
// FIXME: do not map to Typedef but to a custom variant
AssocTypeItem(t, _) => ItemEnum::Typedef(t.into_tcx(tcx)),
AssocTypeItem(t, b) => ItemEnum::AssocType {
generics: t.generics.into_tcx(tcx),
bounds: b.into_iter().map(|x| x.into_tcx(tcx)).collect(),
default: t.item_type.map(|ty| ty.into_tcx(tcx)),
},
// `convert_item` early returns `None` for striped items and keywords.
StrippedItem(_) | KeywordItem(_) => unreachable!(),
ExternCrateItem { ref src } => ItemEnum::ExternCrate {
Expand Down