From 2a996e8f2566ff2b4fa54cc882aba75081541320 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <josh@nega.tv>
Date: Mon, 5 Sep 2022 08:40:33 +0200
Subject: [PATCH] Rename `virtual_vec` inner types

Remove `virtual` from the inner module names to avoid repetition.
Rename `RawVirtualVec` to `VirtualRawVec` so it's more consistent.
---
 .../src/virtual_vec/{virtual_deque.rs => deque.rs}   |  6 +++---
 narcissus-core/src/virtual_vec/mod.rs                | 12 ++++++------
 .../virtual_vec/{raw_virtual_vec.rs => raw_vec.rs}   |  6 +++---
 .../src/virtual_vec/{virtual_vec.rs => vec.rs}       |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename narcissus-core/src/virtual_vec/{virtual_deque.rs => deque.rs} (99%)
 rename narcissus-core/src/virtual_vec/{raw_virtual_vec.rs => raw_vec.rs} (97%)
 rename narcissus-core/src/virtual_vec/{virtual_vec.rs => vec.rs} (98%)

diff --git a/narcissus-core/src/virtual_vec/virtual_deque.rs b/narcissus-core/src/virtual_vec/deque.rs
similarity index 99%
rename from narcissus-core/src/virtual_vec/virtual_deque.rs
rename to narcissus-core/src/virtual_vec/deque.rs
index 219645b..5e5c12b 100644
--- a/narcissus-core/src/virtual_vec/virtual_deque.rs
+++ b/narcissus-core/src/virtual_vec/deque.rs
@@ -3,13 +3,13 @@ use std::ops::{Index, IndexMut};
 use std::ptr;
 use std::slice;
 
-use super::RawVirtualVec;
+use super::VirtualRawVec;
 
 const INITIAL_CAPACITY: usize = 7; // 2^3 - 1
 const MINIMUM_CAPACITY: usize = 1; // 2 - 1
 
 pub struct VirtualDeque<T> {
-    buf: RawVirtualVec<T>,
+    buf: VirtualRawVec<T>,
     head: usize,
     tail: usize,
 }
@@ -24,7 +24,7 @@ impl<T> VirtualDeque<T> {
         assert!(max_capacity < std::isize::MAX as usize);
         let cap = std::cmp::max(capacity + 1, MINIMUM_CAPACITY + 1).next_power_of_two();
         Self {
-            buf: RawVirtualVec::with_capacity(cap, max_capacity),
+            buf: VirtualRawVec::with_capacity(cap, max_capacity),
             head: 0,
             tail: 0,
         }
diff --git a/narcissus-core/src/virtual_vec/mod.rs b/narcissus-core/src/virtual_vec/mod.rs
index 74cbb44..ef60da2 100644
--- a/narcissus-core/src/virtual_vec/mod.rs
+++ b/narcissus-core/src/virtual_vec/mod.rs
@@ -1,10 +1,10 @@
-mod raw_virtual_vec;
-mod virtual_deque;
-mod virtual_vec;
+mod deque;
+mod raw_vec;
+mod vec;
 
-pub use self::raw_virtual_vec::RawVirtualVec;
-pub use self::virtual_deque::VirtualDeque;
-pub use self::virtual_vec::VirtualVec;
+pub use self::deque::VirtualDeque;
+pub use self::raw_vec::VirtualRawVec;
+pub use self::vec::VirtualVec;
 
 #[cfg(test)]
 mod tests {
diff --git a/narcissus-core/src/virtual_vec/raw_virtual_vec.rs b/narcissus-core/src/virtual_vec/raw_vec.rs
similarity index 97%
rename from narcissus-core/src/virtual_vec/raw_virtual_vec.rs
rename to narcissus-core/src/virtual_vec/raw_vec.rs
index 8101c9f..688cf0a 100644
--- a/narcissus-core/src/virtual_vec/raw_virtual_vec.rs
+++ b/narcissus-core/src/virtual_vec/raw_vec.rs
@@ -6,13 +6,13 @@ use std::{
 
 use crate::{page_size, virtual_commit, virtual_free, virtual_reserve};
 
-pub struct RawVirtualVec<T> {
+pub struct VirtualRawVec<T> {
     ptr: NonNull<T>,
     cap: usize,
     max_cap: usize,
 }
 
-impl<T> RawVirtualVec<T> {
+impl<T> VirtualRawVec<T> {
     pub fn new(max_capacity: usize) -> Self {
         assert!(max_capacity != 0);
 
@@ -121,7 +121,7 @@ impl<T> RawVirtualVec<T> {
     }
 }
 
-impl<T> Drop for RawVirtualVec<T> {
+impl<T> Drop for VirtualRawVec<T> {
     fn drop(&mut self) {
         unsafe {
             // The preconditions here that max_cap multiplied by the size won't overflow and
diff --git a/narcissus-core/src/virtual_vec/virtual_vec.rs b/narcissus-core/src/virtual_vec/vec.rs
similarity index 98%
rename from narcissus-core/src/virtual_vec/virtual_vec.rs
rename to narcissus-core/src/virtual_vec/vec.rs
index 9f2a927..38cfbd6 100644
--- a/narcissus-core/src/virtual_vec/virtual_vec.rs
+++ b/narcissus-core/src/virtual_vec/vec.rs
@@ -1,10 +1,10 @@
 use std::ops::{Deref, DerefMut};
 use std::ptr;
 
-use super::RawVirtualVec;
+use super::VirtualRawVec;
 
 pub struct VirtualVec<T> {
-    buf: RawVirtualVec<T>,
+    buf: VirtualRawVec<T>,
     len: usize,
 }
 
@@ -20,14 +20,14 @@ impl<T> VirtualVec<T> {
     /// Panics if the memory reservation fails, or if there's any overflow in the size calculations.
     pub fn new(max_capacity: usize) -> Self {
         Self {
-            buf: RawVirtualVec::new(max_capacity),
+            buf: VirtualRawVec::new(max_capacity),
             len: 0,
         }
     }
 
     pub fn with_capacity(capacity: usize, max_capacity: usize) -> Self {
         Self {
-            buf: RawVirtualVec::with_capacity(capacity, max_capacity),
+            buf: VirtualRawVec::with_capacity(capacity, max_capacity),
             len: 0,
         }
     }
-- 
2.49.0