ci: enable clippy lints (#1335)

This commit is contained in:
Taiki Endo
2019-07-26 03:47:14 +09:00
committed by GitHub
parent f311ac3d4f
commit fe021e6c00
54 changed files with 394 additions and 274 deletions
+6 -6
View File
@@ -235,12 +235,12 @@ impl Backup {
impl State {
/// Returns a new, default, thread `State`
pub fn new() -> State {
pub(crate) fn new() -> State {
State(0)
}
/// Returns true if the thread entry is pushed in the sleeper stack
pub fn is_pushed(&self) -> bool {
pub(crate) fn is_pushed(self) -> bool {
self.0 & PUSHED == PUSHED
}
@@ -248,19 +248,19 @@ impl State {
self.0 &= !PUSHED;
}
pub fn is_running(&self) -> bool {
pub(crate) fn is_running(self) -> bool {
self.0 & RUNNING == RUNNING
}
pub fn set_running(&mut self) {
pub(crate) fn set_running(&mut self) {
self.0 |= RUNNING;
}
pub fn unset_running(&mut self) {
pub(crate) fn unset_running(&mut self) {
self.0 &= !RUNNING;
}
pub fn is_terminated(&self) -> bool {
pub(crate) fn is_terminated(self) -> bool {
self.0 & TERMINATED == TERMINATED
}
+2 -5
View File
@@ -93,10 +93,7 @@ impl BackupStack {
/// * `Err(_)` is returned if the pool has been shutdown.
pub fn pop(&self, entries: &[Backup], terminate: bool) -> Result<Option<BackupId>, ()> {
// Figure out the empty value
let terminal = match terminate {
true => TERMINATED,
false => EMPTY,
};
let terminal = if terminate { TERMINATED } else { EMPTY };
let mut state: State = self.state.load(Acquire).into();
@@ -164,7 +161,7 @@ impl State {
State(EMPTY.0)
}
fn head(&self) -> BackupId {
fn head(self) -> BackupId {
BackupId(self.0 & STACK_MASK)
}
+9 -9
View File
@@ -33,19 +33,19 @@ pub(crate) const MAX_FUTURES: usize = usize::MAX >> NUM_FUTURES_OFFSET;
impl State {
#[inline]
pub fn new() -> State {
pub(crate) fn new() -> State {
State(0)
}
/// Returns the number of futures still pending completion.
pub fn num_futures(&self) -> usize {
pub(crate) fn num_futures(self) -> usize {
self.0 >> NUM_FUTURES_OFFSET
}
/// Increment the number of futures pending completion.
///
/// Returns false on failure.
pub fn inc_num_futures(&mut self) {
pub(crate) fn inc_num_futures(&mut self) {
debug_assert!(self.num_futures() < MAX_FUTURES);
debug_assert!(self.lifecycle() < Lifecycle::ShutdownNow);
@@ -53,7 +53,7 @@ impl State {
}
/// Decrement the number of futures pending completion.
pub fn dec_num_futures(&mut self) {
pub(crate) fn dec_num_futures(&mut self) {
let num_futures = self.num_futures();
if num_futures == 0 {
@@ -69,19 +69,19 @@ impl State {
}
/// Set the number of futures pending completion to zero
pub fn clear_num_futures(&mut self) {
self.0 = self.0 & LIFECYCLE_MASK;
pub(crate) fn clear_num_futures(&mut self) {
self.0 &= LIFECYCLE_MASK;
}
pub fn lifecycle(&self) -> Lifecycle {
pub(crate) fn lifecycle(self) -> Lifecycle {
(self.0 & LIFECYCLE_MASK).into()
}
pub fn set_lifecycle(&mut self, val: Lifecycle) {
pub(crate) fn set_lifecycle(&mut self, val: Lifecycle) {
self.0 = (self.0 & NUM_FUTURES_MASK) | (val as usize);
}
pub fn is_terminated(&self) -> bool {
pub(crate) fn is_terminated(self) -> bool {
self.lifecycle() == Lifecycle::ShutdownNow && self.num_futures() == 0
}
}