Skip to content

Commit

Permalink
chore: bump nightly version used in CI (#2178)
Browse files Browse the repository at this point in the history
This requires fixing a few warnings.
  • Loading branch information
carllerche authored Jan 27, 2020
1 parent 4996e27 commit 71c47fa
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pr: ["master"]

variables:
RUSTFLAGS: -Dwarnings
nightly: nightly-2019-11-16
nightly: nightly-2020-01-25

jobs:
# Test top level crate
Expand Down
3 changes: 3 additions & 0 deletions tokio-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

//! Macros for use with Tokio
// This `extern` is required for older `rustc` versions but newer `rustc`
// versions warn about the unused `extern crate`.
#[allow(unused_extern_crates)]
extern crate proc_macro;

mod entry;
Expand Down
2 changes: 1 addition & 1 deletion tokio/src/time/driver/atomic_stack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ impl Iterator for AtomicStackEntries {
let entry = unsafe { Arc::from_raw(self.ptr) };

// Update `self.ptr` to point to the next element of the stack
self.ptr = unsafe { (*entry.next_atomic.get()) };
self.ptr = unsafe { *entry.next_atomic.get() };

// Unset the queued flag
let res = entry.queued.fetch_and(false, SeqCst);
Expand Down
4 changes: 2 additions & 2 deletions tokio/src/time/driver/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ impl Entry {
/// The current entry state as known by the timer. This is not the value of
/// `state`, but lets the timer know how to converge its state to `state`.
pub(crate) fn when_internal(&self) -> Option<u64> {
unsafe { (*self.when.get()) }
unsafe { *self.when.get() }
}

pub(crate) fn set_when_internal(&self, when: Option<u64>) {
unsafe {
(*self.when.get()) = when;
*self.when.get() = when;
}
}

Expand Down
2 changes: 1 addition & 1 deletion tokio/src/time/wheel/level.rs
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ impl<T> fmt::Debug for Level<T> {
}

fn occupied_bit(slot: usize) -> u64 {
(1 << slot)
1 << slot
}

fn slot_range(level: usize) -> u64 {
Expand Down

0 comments on commit 71c47fa

Please sign in to comment.