bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Correctly handle niche of enum

Browse source
This commit is contained in:
Deadbeef 2021-09-06 07:09:32 +00:00
parent 5f1505e7f1
commit c0451f73b2
No known key found for this signature in database
GPG key ID: 027DF9338862ADDD
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustdoc/html/render/print_item.rs
View file

@ -13,7 +13,7 @@ use rustc_middle::ty::layout::LayoutError;
use rustc_middle::ty::{Adt, TyCtxt}; use rustc_middle::ty::{Adt, TyCtxt};
use rustc_span::hygiene::MacroKind; use rustc_span::hygiene::MacroKind;
use rustc_span::symbol::{kw, sym, Symbol}; use rustc_span::symbol::{kw, sym, Symbol};
use rustc_target::abi::{Layout, Primitive, Variants}; use rustc_target::abi::{Layout, Primitive, TagEncoding, Variants};
use super::{ use super::{
collect_paths_for_type, document, ensure_trailing_slash, item_ty_to_strs, notable_traits_decl, collect_paths_for_type, document, ensure_trailing_slash, item_ty_to_strs, notable_traits_decl,
@ -1639,7 +1639,9 @@ fn document_type_layout(w: &mut Buffer, cx: &Context<'_>, ty_def_id: DefId) {
w.write_str("<p><strong>Size:</strong> "); w.write_str("<p><strong>Size:</strong> ");
write_size_of_layout(w, ty_layout.layout, 0); write_size_of_layout(w, ty_layout.layout, 0);
writeln!(w, "</p>"); writeln!(w, "</p>");
if let Variants::Multiple { variants, tag, .. } = &ty_layout.layout.variants { if let Variants::Multiple { variants, tag, tag_encoding, .. } =
&ty_layout.layout.variants
{
if !variants.is_empty() { if !variants.is_empty() {
w.write_str( w.write_str(
"<p><strong>Size for each variant:</strong></p>\ "<p><strong>Size for each variant:</strong></p>\
@ -1652,10 +1654,12 @@ fn document_type_layout(w: &mut Buffer, cx: &Context<'_>, ty_def_id: DefId) {
span_bug!(tcx.def_span(ty_def_id), "not an adt") span_bug!(tcx.def_span(ty_def_id), "not an adt")
}; };
let tag_size = if let Primitive::Int(i, _) = tag.value { let tag_size = if let TagEncoding::Niche { .. } = tag_encoding {
0
} else if let Primitive::Int(i, _) = tag.value {
i.size().bytes() i.size().bytes()
} else { } else {
span_bug!(tcx.def_span(ty_def_id), "tag is not int") span_bug!(tcx.def_span(ty_def_id), "tag is neither niche nor int")
}; };
for (index, layout) in variants.iter_enumerated() { for (index, layout) in variants.iter_enumerated() {

9
src/test/rustdoc/type-layout.rs
View file

@ -61,3 +61,12 @@ pub enum Variants {
A, A,
B(u8), B(u8),
} }
// @has type_layout/enum.WithNiche.html 'Size: '
// @has - //p '4 bytes'
// @has - '<code>None</code>: 0 bytes'
// @has - '<code>Some</code>: 4 bytes'
pub enum WithNiche {
None,
Some(std::num::NonZeroU32),
}