Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump nightly version used in CI #2178

Merged
merged 1 commit into from
Jan 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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)]
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure if this is the best strategy, but the extern crate proc_macro is required in Rust 1.40 but not on nightly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like the most reasonable way around it. For reference, it was changed in cargo in rust-lang/cargo#7700.

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