@@ -325,137 +325,125 @@ fn bytes_to_mb(total: usize) -> f64 {
325325
326326impl SalsaMemoryDump {
327327 /// Returns a short report that provides total memory usage information.
328- pub fn display_short ( & self ) -> impl fmt:: Display + ' _ {
329- struct DisplayShort < ' a > ( & ' a SalsaMemoryDump ) ;
330-
331- impl fmt:: Display for DisplayShort < ' _ > {
332- fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
333- let SalsaMemoryDump {
334- total_fields,
335- total_metadata,
336- total_memo_fields,
337- total_memo_metadata,
338- ref ingredients,
339- ref memos,
340- } = * self . 0 ;
341-
342- writeln ! ( f, "=======SALSA SUMMARY=======" ) ?;
328+ pub fn display_short ( self ) -> impl fmt:: Display {
329+ std:: fmt:: from_fn ( move |f| {
330+ let SalsaMemoryDump {
331+ total_fields,
332+ total_metadata,
333+ total_memo_fields,
334+ total_memo_metadata,
335+ ref ingredients,
336+ ref memos,
337+ } = self ;
338+
339+ writeln ! ( f, "=======SALSA SUMMARY=======" ) ?;
340+
341+ writeln ! (
342+ f,
343+ "TOTAL MEMORY USAGE: {:.2}MB" ,
344+ bytes_to_mb(
345+ total_metadata + total_fields + total_memo_fields + total_memo_metadata
346+ )
347+ ) ?;
348+
349+ writeln ! (
350+ f,
351+ " struct metadata = {:.2}MB" ,
352+ bytes_to_mb( total_metadata) ,
353+ ) ?;
354+ writeln ! ( f, " struct fields = {:.2}MB" , bytes_to_mb( total_fields) ) ?;
355+ writeln ! (
356+ f,
357+ " memo metadata = {:.2}MB" ,
358+ bytes_to_mb( total_memo_metadata) ,
359+ ) ?;
360+ writeln ! (
361+ f,
362+ " memo fields = {:.2}MB" ,
363+ bytes_to_mb( total_memo_fields) ,
364+ ) ?;
365+
366+ writeln ! ( f, "QUERY COUNT: {}" , memos. len( ) ) ?;
367+ writeln ! ( f, "STRUCT COUNT: {}" , ingredients. len( ) ) ?;
368+
369+ Ok ( ( ) )
370+ } )
371+ }
343372
344- writeln ! (
345- f,
346- "TOTAL MEMORY USAGE: {:.2}MB" ,
347- bytes_to_mb(
348- total_metadata + total_fields + total_memo_fields + total_memo_metadata
349- )
350- ) ?;
373+ /// Returns a short report that provides fine-grained memory usage information per
374+ /// Salsa ingredient.
375+ pub fn display_full ( self ) -> impl fmt:: Display {
376+ std:: fmt:: from_fn ( move |f| {
377+ let SalsaMemoryDump {
378+ total_fields,
379+ total_metadata,
380+ total_memo_fields,
381+ total_memo_metadata,
382+ ref ingredients,
383+ ref memos,
384+ } = self ;
385+
386+ writeln ! ( f, "=======SALSA STRUCTS=======" ) ?;
387+
388+ for ingredient in ingredients {
389+ let size_of_fields =
390+ ingredient. size_of_fields ( ) + ingredient. heap_size_of_fields ( ) . unwrap_or ( 0 ) ;
351391
352392 writeln ! (
353393 f,
354- " struct metadata = {:.2}MB" ,
355- bytes_to_mb( total_metadata) ,
356- ) ?;
357- writeln ! ( f, " struct fields = {:.2}MB" , bytes_to_mb( total_fields) ) ?;
358- writeln ! (
359- f,
360- " memo metadata = {:.2}MB" ,
361- bytes_to_mb( total_memo_metadata) ,
394+ "{:<50} metadata={:<8} fields={:<8} count={}" ,
395+ format!( "`{}`" , ingredient. debug_name( ) ) ,
396+ format!( "{:.2}MB" , bytes_to_mb( ingredient. size_of_metadata( ) ) ) ,
397+ format!( "{:.2}MB" , bytes_to_mb( size_of_fields) ) ,
398+ ingredient. count( )
362399 ) ?;
363- writeln ! (
364- f,
365- " memo fields = {:.2}MB" ,
366- bytes_to_mb( total_memo_fields) ,
367- ) ?;
368-
369- writeln ! ( f, "QUERY COUNT: {}" , memos. len( ) ) ?;
370- writeln ! ( f, "STRUCT COUNT: {}" , ingredients. len( ) ) ?;
371-
372- Ok ( ( ) )
373400 }
374- }
375401
376- DisplayShort ( self )
377- }
402+ writeln ! ( f, "=======SALSA QUERIES=======" ) ?;
378403
379- /// Returns a short report that provides fine-grained memory usage information per
380- /// Salsa ingredient.
381- pub fn display_full ( & self ) -> impl fmt:: Display + ' _ {
382- struct DisplayFull < ' a > ( & ' a SalsaMemoryDump ) ;
383-
384- impl fmt:: Display for DisplayFull < ' _ > {
385- fn fmt ( & self , f : & mut fmt:: Formatter < ' _ > ) -> fmt:: Result {
386- let SalsaMemoryDump {
387- total_fields,
388- total_metadata,
389- total_memo_fields,
390- total_memo_metadata,
391- ref ingredients,
392- ref memos,
393- } = * self . 0 ;
394-
395- writeln ! ( f, "=======SALSA STRUCTS=======" ) ?;
396-
397- for ingredient in ingredients {
398- let size_of_fields =
399- ingredient. size_of_fields ( ) + ingredient. heap_size_of_fields ( ) . unwrap_or ( 0 ) ;
400-
401- writeln ! (
402- f,
403- "{:<50} metadata={:<8} fields={:<8} count={}" ,
404- format!( "`{}`" , ingredient. debug_name( ) ) ,
405- format!( "{:.2}MB" , bytes_to_mb( ingredient. size_of_metadata( ) ) ) ,
406- format!( "{:.2}MB" , bytes_to_mb( size_of_fields) ) ,
407- ingredient. count( )
408- ) ?;
409- }
410-
411- writeln ! ( f, "=======SALSA QUERIES=======" ) ?;
412-
413- for ( query_fn, memo) in memos {
414- let size_of_fields =
415- memo. size_of_fields ( ) + memo. heap_size_of_fields ( ) . unwrap_or ( 0 ) ;
404+ for ( query_fn, memo) in memos {
405+ let size_of_fields =
406+ memo. size_of_fields ( ) + memo. heap_size_of_fields ( ) . unwrap_or ( 0 ) ;
416407
417- writeln ! ( f, "`{query_fn} -> {}`" , memo. debug_name( ) ) ?;
418-
419- writeln ! (
420- f,
421- " metadata={:<8} fields={:<8} count={}" ,
422- format!( "{:.2}MB" , bytes_to_mb( memo. size_of_metadata( ) ) ) ,
423- format!( "{:.2}MB" , bytes_to_mb( size_of_fields) ) ,
424- memo. count( )
425- ) ?;
426- }
427-
428- writeln ! ( f, "=======SALSA SUMMARY=======" ) ?;
429- writeln ! (
430- f,
431- "TOTAL MEMORY USAGE: {:.2}MB" ,
432- bytes_to_mb(
433- total_metadata + total_fields + total_memo_fields + total_memo_metadata
434- )
435- ) ?;
408+ writeln ! ( f, "`{query_fn} -> {}`" , memo. debug_name( ) ) ?;
436409
437410 writeln ! (
438411 f,
439- " struct metadata = {:.2}MB" ,
440- bytes_to_mb( total_metadata) ,
412+ " metadata={:<8} fields={:<8} count={}" ,
413+ format!( "{:.2}MB" , bytes_to_mb( memo. size_of_metadata( ) ) ) ,
414+ format!( "{:.2}MB" , bytes_to_mb( size_of_fields) ) ,
415+ memo. count( )
441416 ) ?;
442- writeln ! ( f, " struct fields = {:.2}MB" , bytes_to_mb( total_fields) ) ?;
443- writeln ! (
444- f,
445- " memo metadata = {:.2}MB" ,
446- bytes_to_mb( total_memo_metadata) ,
447- ) ?;
448- writeln ! (
449- f,
450- " memo fields = {:.2}MB" ,
451- bytes_to_mb( total_memo_fields) ,
452- ) ?;
453-
454- Ok ( ( ) )
455417 }
456- }
457418
458- DisplayFull ( self )
419+ writeln ! ( f, "=======SALSA SUMMARY=======" ) ?;
420+ writeln ! (
421+ f,
422+ "TOTAL MEMORY USAGE: {:.2}MB" ,
423+ bytes_to_mb(
424+ total_metadata + total_fields + total_memo_fields + total_memo_metadata
425+ )
426+ ) ?;
427+
428+ writeln ! (
429+ f,
430+ " struct metadata = {:.2}MB" ,
431+ bytes_to_mb( total_metadata) ,
432+ ) ?;
433+ writeln ! ( f, " struct fields = {:.2}MB" , bytes_to_mb( total_fields) ) ?;
434+ writeln ! (
435+ f,
436+ " memo metadata = {:.2}MB" ,
437+ bytes_to_mb( total_memo_metadata) ,
438+ ) ?;
439+ writeln ! (
440+ f,
441+ " memo fields = {:.2}MB" ,
442+ bytes_to_mb( total_memo_fields) ,
443+ ) ?;
444+
445+ Ok ( ( ) )
446+ } )
459447 }
460448
461449 /// Serializes the memory dump to JSON.
0 commit comments