From 544bbcde92a6b77ff9b1a04456e708f1d082c506 Mon Sep 17 00:00:00 2001 From: Matt Murphy Date: Sun, 27 Apr 2014 17:27:54 -0500 Subject: [PATCH] ~[] to Vec in util/time.rs --- src/components/util/time.rs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/components/util/time.rs b/src/components/util/time.rs index d05cac3e2f3..387aadae0bb 100644 --- a/src/components/util/time.rs +++ b/src/components/util/time.rs @@ -63,21 +63,21 @@ impl ProfilerCategory { // enumeration of all ProfilerCategory types fn empty_buckets() -> ProfilerBuckets { let mut buckets = TreeMap::new(); - buckets.insert(CompositingCategory, ~[]); - buckets.insert(LayoutQueryCategory, ~[]); - buckets.insert(LayoutPerformCategory, ~[]); - buckets.insert(LayoutStyleRecalcCategory, ~[]); - buckets.insert(LayoutSelectorMatchCategory, ~[]); - buckets.insert(LayoutTreeBuilderCategory, ~[]); - buckets.insert(LayoutMainCategory, ~[]); - buckets.insert(LayoutParallelWarmupCategory, ~[]); - buckets.insert(LayoutShapingCategory, ~[]); - buckets.insert(LayoutDamagePropagateCategory, ~[]); - buckets.insert(LayoutDispListBuildCategory, ~[]); - buckets.insert(GfxRegenAvailableFontsCategory, ~[]); - buckets.insert(RenderingDrawingCategory, ~[]); - buckets.insert(RenderingPrepBuffCategory, ~[]); - buckets.insert(RenderingCategory, ~[]); + buckets.insert(CompositingCategory, Vec::new()); + buckets.insert(LayoutQueryCategory, Vec::new()); + buckets.insert(LayoutPerformCategory, Vec::new()); + buckets.insert(LayoutStyleRecalcCategory, Vec::new()); + buckets.insert(LayoutSelectorMatchCategory, Vec::new()); + buckets.insert(LayoutTreeBuilderCategory, Vec::new()); + buckets.insert(LayoutMainCategory, Vec::new()); + buckets.insert(LayoutParallelWarmupCategory, Vec::new()); + buckets.insert(LayoutShapingCategory, Vec::new()); + buckets.insert(LayoutDamagePropagateCategory, Vec::new()); + buckets.insert(LayoutDispListBuildCategory, Vec::new()); + buckets.insert(GfxRegenAvailableFontsCategory, Vec::new()); + buckets.insert(RenderingDrawingCategory, Vec::new()); + buckets.insert(RenderingPrepBuffCategory, Vec::new()); + buckets.insert(RenderingCategory, Vec::new()); buckets } @@ -100,7 +100,7 @@ impl ProfilerCategory { } } -type ProfilerBuckets = TreeMap; +type ProfilerBuckets = TreeMap>; // back end of the profiler that handles data aggregation and performance metrics pub struct Profiler { @@ -200,7 +200,7 @@ impl Profiler { if data_len > 0 { let (mean, median, min, max) = (data.iter().map(|&x|x).sum() / (data_len as f64), - data[data_len / 2], + data.get(data_len / 2).clone(), data.iter().fold(f64::INFINITY, |a, &b| a.min(b)), data.iter().fold(-f64::INFINITY, |a, &b| a.max(b))); println!("{:-35s}: {:15.4f} {:15.4f} {:15.4f} {:15.4f} {:15u}",