From 9f49538b84bb356566b4914b89e807943647a7dc Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 15 Mar 2020 23:21:53 +0100 Subject: [PATCH 1/2] Rename files from heap to bin_heap The use of 'heap' for labelling the data structure clashes with dynamic memory 'heap'. This is purely a naming convention change, and should have no affect on implementation. --- src/native.rs | 8 ++++---- src/native/{heap.rs => bin_heap.rs} | 0 src/native/{heap_timer.rs => bin_heap_timer.rs} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename src/native/{heap.rs => bin_heap.rs} (100%) rename src/native/{heap_timer.rs => bin_heap_timer.rs} (100%) diff --git a/src/native.rs b/src/native.rs index c38d464..1cdfb98 100644 --- a/src/native.rs +++ b/src/native.rs @@ -2,14 +2,14 @@ mod arc_list; mod atomic_waker; mod delay; mod global; -mod heap; -mod heap_timer; +mod bin_heap; +mod bin_heap_timer; mod timer; use self::arc_list::{ArcList, Node}; use self::atomic_waker::AtomicWaker; -use self::heap::{Heap, Slot}; -use self::heap_timer::HeapTimer; +use self::bin_heap::{Heap, Slot}; +use self::bin_heap_timer::HeapTimer; use self::timer::{ScheduledTimer, Timer, TimerHandle}; pub use self::delay::Delay; diff --git a/src/native/heap.rs b/src/native/bin_heap.rs similarity index 100% rename from src/native/heap.rs rename to src/native/bin_heap.rs diff --git a/src/native/heap_timer.rs b/src/native/bin_heap_timer.rs similarity index 100% rename from src/native/heap_timer.rs rename to src/native/bin_heap_timer.rs From fd903c141504ad17b2536ebf64d6c834a1d60b68 Mon Sep 17 00:00:00 2001 From: Ben Date: Sun, 15 Mar 2020 23:56:10 +0100 Subject: [PATCH 2/2] Apply cargo fmt. --- src/native.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/native.rs b/src/native.rs index 1cdfb98..70f8940 100644 --- a/src/native.rs +++ b/src/native.rs @@ -1,9 +1,9 @@ mod arc_list; mod atomic_waker; -mod delay; -mod global; mod bin_heap; mod bin_heap_timer; +mod delay; +mod global; mod timer; use self::arc_list::{ArcList, Node};