Skip to content

Commit 8835adc

Browse files
committed
reorganize modules
1 parent d84a1cd commit 8835adc

File tree

9 files changed

+14
-10
lines changed

9 files changed

+14
-10
lines changed

src/collector.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::tls::Thread;
2-
use crate::{membarrier, raw, LocalGuard, OwnedGuard};
1+
use crate::raw::{self, membarrier, Thread};
2+
use crate::{LocalGuard, OwnedGuard};
33

44
use std::fmt;
55
use std::sync::atomic::{AtomicUsize, Ordering};

src/guard.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use std::fmt;
22
use std::marker::PhantomData;
33
use std::sync::atomic::{AtomicPtr, Ordering};
44

5-
use crate::raw::Reservation;
6-
use crate::tls::Thread;
5+
use crate::raw::{Reservation, Thread};
76
use crate::Collector;
87

98
/// A guard that enables protected loads of concurrent objects.

src/lib.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44

55
mod collector;
66
mod guard;
7-
mod membarrier;
87
mod raw;
9-
mod tls;
10-
mod utils;
118

129
pub mod guide;
1310
pub mod reclaim;

src/raw.rs renamed to src/raw/collector.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
use crate::membarrier;
2-
use crate::tls::{Thread, ThreadLocal};
3-
use crate::utils::CachePadded;
1+
use super::membarrier;
2+
use super::tls::{Thread, ThreadLocal};
3+
use super::utils::CachePadded;
44

55
use std::cell::{Cell, UnsafeCell};
66
use std::ptr;
File renamed without changes.

src/raw/mod.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
mod collector;
2+
mod tls;
3+
mod utils;
4+
5+
pub mod membarrier;
6+
7+
pub use collector::{Collector, Reservation};
8+
pub use tls::Thread;
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)