Say the environment once, and stop a hint read going uncounted
The eleventh sweep, over the built-in bounds work in2ac0843. `Painter::size_hint` refused to answer for a bounded widget by returning above the diagnostics, so that read was neither a hint hit nor a miss and `hint_read` recorded nothing. It is a miss now, with the reason on it. The two `for axis in Axis::BOTH` loops that `draw_widget` grew, both writing `own_holds`, are one loop, and the comment about combining the ask's holds no longer sits between a comment and the code it describes. `Declared::from_axes` lost its only caller with `Widgets::declared_lens`; `Bounds::from_axes` and `SizeRule::declared` never had one. The scenario shrinker printed a rule with derived `Debug`, which is 130 characters an axis in a line that carries every ancestor, in the one function whose job is output a tree can be rebuilt from. It prints its parts again. `bounds_cost` invented three environment-reading spellings where four copies of one `env` helper already existed; there is now one, in `tests/rig`, and the four copies are gone. It also verified 128 regions inside its measured loop, which the other rigs deliberately do before theirs; that measured 0.65% of the total, and none of it is layout. The 250-window row with a 300 cap was built by two tests, and the one that still explained itself tested less; they are one. The half of `a_cap_attribute_narrows_the_widgets_box` that the wrapper's removal left without its deciding assertion is the allocator's path instead, which nothing at the root covered. Format, workspace clippy under -D warnings with and without layout-diagnostics, 206 ordinary and 210 diagnostic tests, 400 depth-5 trees warm against cold in 64.19s, and the cold dump byte-identical to2ac0843across all 34,986 boxes.
This commit is contained in:
1 parent
2ac0843cb2
commit
ea1f836bf9
16 files changed
+178
-146
No files matched your search
@@ -439,10 +439,14 @@ impl<'a> Painter<'a> {
|
||||
/// against this widget's rel base, which is the rel base a child asked with
|
||||
/// nothing narrowed gets. Asking counts as reading its size.
|
||||
pub fn size_hint<W: ?Sized>(&mut self, id: &StrongWidget<W>, axis: Axis) -> Option<LayoutLen> {
|
||||
if self.rsc.widgets().size_rules(id.id())[axis].bound != Bound::ANY {
|
||||
return None;
|
||||
}
|
||||
let hint = self.rsc.widgets().exact_len(id.id(), axis);
|
||||
// A bound is composed into a request rather than applied to a hint,
|
||||
// so a bounded widget cannot say its length without being asked: what
|
||||
// it comes to is a comparison only the ask or the allocator makes.
|
||||
// A miss rather than no read at all, so the counters see it.
|
||||
let bounded = self.rsc.widgets().size_rules(id.id())[axis].bound != Bound::ANY;
|
||||
let hint = (!bounded)
|
||||
.then(|| self.rsc.widgets().exact_len(id.id(), axis))
|
||||
.flatten();
|
||||
let rel_base = self.rel_base[axis];
|
||||
let resolved = hint.map(|hint| hint.within_len(rel_base));
|
||||
#[cfg(feature = "layout-diagnostics")]
|
||||
|
||||
Reference in new issue
Block a user