@@ -22,6 +22,10 @@ impl NodeStats {
22
22
fn new ( ) -> NodeStats {
23
23
NodeStats { count : 0 , size : 0 }
24
24
}
25
+
26
+ fn nodes_size ( & self ) -> usize {
27
+ self . count * self . size
28
+ }
25
29
}
26
30
27
31
struct Node {
@@ -121,11 +125,9 @@ impl<'k> StatCollector<'k> {
121
125
// We will soon sort, so the initial order does not matter.
122
126
#[ allow( rustc:: potential_query_instability) ]
123
127
let mut nodes: Vec < _ > = self . nodes . iter ( ) . collect ( ) ;
124
- nodes. sort_by_cached_key ( |( label, node) | {
125
- ( node. stats . count * node. stats . size , label. to_owned ( ) )
126
- } ) ;
128
+ nodes. sort_by_cached_key ( |( label, node) | ( node. stats . nodes_size ( ) , label. to_owned ( ) ) ) ;
127
129
128
- let total_size = nodes. iter ( ) . map ( |( _, node) | node. stats . count * node . stats . size ) . sum ( ) ;
130
+ let total_size = nodes. iter ( ) . map ( |( _, node) | node. stats . nodes_size ( ) ) . sum ( ) ;
129
131
let total_count = nodes. iter ( ) . map ( |( _, node) | node. stats . count ) . sum ( ) ;
130
132
131
133
eprintln ! ( "{prefix} {title}" ) ;
@@ -138,7 +140,7 @@ impl<'k> StatCollector<'k> {
138
140
let percent = |m, n| ( m * 100 ) as f64 / n as f64 ;
139
141
140
142
for ( label, node) in nodes {
141
- let size = node. stats . count * node . stats . size ;
143
+ let size = node. stats . nodes_size ( ) ;
142
144
eprintln ! (
143
145
"{} {:<18}{:>10} ({:4.1}%){:>14}{:>14}" ,
144
146
prefix,
@@ -153,12 +155,11 @@ impl<'k> StatCollector<'k> {
153
155
#[ allow( rustc:: potential_query_instability) ]
154
156
let mut subnodes: Vec < _ > = node. subnodes . iter ( ) . collect ( ) ;
155
157
subnodes. sort_by ( |( label1, subnode1) , ( label2, subnode2) | {
156
- ( subnode1. count * subnode1. size , label1)
157
- . cmp ( & ( subnode2. count * subnode2. size , label2) )
158
+ ( subnode1. nodes_size ( ) , label1) . cmp ( & ( subnode2. nodes_size ( ) , label2) )
158
159
} ) ;
159
160
160
161
for ( label, subnode) in subnodes {
161
- let size = subnode. count * subnode . size ;
162
+ let size = subnode. nodes_size ( ) ;
162
163
eprintln ! (
163
164
"{} - {:<18}{:>10} ({:4.1}%){:>14}" ,
164
165
prefix,
0 commit comments