mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Name some local variables more consistently.

Browse Source 
By making every `alt_foo` exactly match a `foo`.
This commit is contained in:
Nicholas Nethercote 2023-10-01 21:35:07 +11:00
parent 2369adc5d8
commit 17e3793eb1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compiler/rustc_abi/src/layout.rs
View File

@ -65,8 +65,8 @@ pub trait LayoutCalculator {
if !matches!(kind, StructKind::MaybeUnsized) { if !matches!(kind, StructKind::MaybeUnsized) {
if let Some(niche) = layout.largest_niche { if let Some(niche) = layout.largest_niche {
let head_space = niche.offset.bytes(); let head_space = niche.offset.bytes();
let niche_length = niche.value.size(dl).bytes(); let niche_len = niche.value.size(dl).bytes();
let tail_space = layout.size.bytes() - head_space - niche_length; let tail_space = layout.size.bytes() - head_space - niche_len;
// This may end up doing redundant work if the niche is already in the last // This may end up doing redundant work if the niche is already in the last
// field (e.g. a trailing bool) and there is tail padding. But it's non-trivial // field (e.g. a trailing bool) and there is tail padding. But it's non-trivial
@ -74,11 +74,11 @@ pub trait LayoutCalculator {
if fields.len() > 1 && head_space != 0 && tail_space > 0 { if fields.len() > 1 && head_space != 0 && tail_space > 0 {
let alt_layout = univariant(self, dl, fields, repr, kind, NicheBias::End) let alt_layout = univariant(self, dl, fields, repr, kind, NicheBias::End)
.expect("alt layout should always work"); .expect("alt layout should always work");
let niche = alt_layout let alt_niche = alt_layout
.largest_niche .largest_niche
.expect("alt layout should have a niche like the regular one"); .expect("alt layout should have a niche like the regular one");
let alt_head_space = niche.offset.bytes(); let alt_head_space = alt_niche.offset.bytes();
let alt_niche_len = niche.value.size(dl).bytes(); let alt_niche_len = alt_niche.value.size(dl).bytes();
let alt_tail_space = let alt_tail_space =
alt_layout.size.bytes() - alt_head_space - alt_niche_len; alt_layout.size.bytes() - alt_head_space - alt_niche_len;
@ -93,7 +93,7 @@ pub trait LayoutCalculator {
alt_layout: {}\n", alt_layout: {}\n",
layout.size.bytes(), layout.size.bytes(),
head_space, head_space,
niche_length, niche_len,
tail_space, tail_space,
alt_head_space, alt_head_space,
alt_niche_len, alt_niche_len,