Skip to content

Commit

Permalink
Fix compile error + warnings
Browse files Browse the repository at this point in the history
Signed-off-by: Harsha Vamsi Kalluri <[email protected]>
  • Loading branch information
harshavamsi committed Feb 9, 2024
1 parent 0d330d5 commit 19eeead
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/core/index/merge/merge_rate_limiter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
use core::store::RateLimiter;

use core::index::ErrorKind::MergeAborted;
use std::cell::UnsafeCell;

use error::{ErrorKind, Result};

use std::f64;
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
use std::sync::{Condvar, Mutex, RwLock};
use std::sync::{Condvar, Mutex};
use std::time::{Duration, SystemTime};

use core::util::external::Volatile;
Expand Down
2 changes: 1 addition & 1 deletion src/core/index/merge/merge_scheduler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ impl ConcurrentMergeSchedulerInner {
#[allow(clippy::mut_from_ref)]
unsafe fn scheduler_mut(
&self,
_guard: &MutexGuard<(ConcurrentMergeSchedulerInner)>,
_guard: &MutexGuard<ConcurrentMergeSchedulerInner>,
) -> &mut ConcurrentMergeSchedulerInner {
let t = self as *const ConcurrentMergeSchedulerInner as *mut ConcurrentMergeSchedulerInner
as *const UnsafeCell<ConcurrentMergeSchedulerInner>;
Expand Down

0 comments on commit 19eeead

Please sign in to comment.