Skip to content

Commit

Permalink
Rollup merge of rust-lang#98692 - camelid:more-fixmes, r=GuillaumeGomez
Browse files Browse the repository at this point in the history
rustdoc: Cleanup more FIXMEs

r? `@GuillaumeGomez`
  • Loading branch information
Dylan-DPC authored Jul 7, 2022
2 parents 7260f7e + 2d2fd31 commit c78e7f5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/librustdoc/clean/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1705,8 +1705,8 @@ fn clean_ty<'tcx>(this: Ty<'tcx>, cx: &mut DocContext<'tcx>, def_id: Option<DefI
ImplTrait(bounds)
}

ty::Closure(..) | ty::Generator(..) => Tuple(vec![]), // FIXME(pcwalton)

ty::Closure(..) => panic!("Closure"),
ty::Generator(..) => panic!("Generator"),
ty::Bound(..) => panic!("Bound"),
ty::Placeholder(..) => panic!("Placeholder"),
ty::GeneratorWitness(..) => panic!("GeneratorWitness"),
Expand Down Expand Up @@ -1760,7 +1760,6 @@ fn is_field_vis_inherited(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
match tcx.def_kind(parent) {
DefKind::Struct | DefKind::Union => false,
DefKind::Variant => true,
// FIXME: what about DefKind::Ctor?
parent_kind => panic!("unexpected parent kind: {:?}", parent_kind),
}
}
Expand Down
3 changes: 0 additions & 3 deletions src/librustdoc/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,6 @@ pub(crate) struct RenderOptions {
pub(crate) resource_suffix: String,
/// Whether to run the static CSS/JavaScript through a minifier when outputting them. `true` by
/// default.
//
// FIXME(misdreavus): the flag name is `--disable-minification` but the meaning is inverted
// once read.
pub(crate) enable_minification: bool,
/// Whether to create an index page in the root of the output directory. If this is true but
/// `enable_index_page` is None, generate a static listing of crates instead.
Expand Down

0 comments on commit c78e7f5

Please sign in to comment.