Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Noah-Kennedy committed Oct 26, 2022
1 parent 78b5f73 commit 62b42ab
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/driver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ mod write;

mod writev;

use io_uring::{cqueue, IoUring};
use io_uring::IoUring;
use slab::Slab;
use std::io;
use std::os::unix::io::{AsRawFd, RawFd};
Expand Down Expand Up @@ -73,7 +73,7 @@ impl Driver {
}

fn num_operations(&mut self) -> usize {
self.ops.0.len()
self.ops.lifecycle.len()
}

pub(crate) fn tick(&mut self) {
Expand Down

0 comments on commit 62b42ab

Please sign in to comment.