summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <me@carllerche.com>2019-07-10 14:36:36 -0700
committerGitHub <noreply@github.com>2019-07-10 14:36:36 -0700
commit7ac8bfc82133a19cabc917e5ab55902e3b2441df (patch)
tree716a47e7b3dfe02977296abbb67115c4522544cb
parenta79483750ff550d95b95cb19fb211637f67c1745 (diff)
chore: bump to newer nightly (#1284)
-rw-r--r--.cirrus.yml5
-rw-r--r--azure-pipelines.yml2
-rw-r--r--tokio-sync/src/mpsc/block.rs1
-rw-r--r--tokio-sync/src/oneshot.rs1
-rw-r--r--tokio-uds/src/ucred.rs1
5 files changed, 8 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml
index 5d47ab9a..0929f1d1 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,10 +13,13 @@ task:
- pkg install -y curl
- curl https://sh.rustup.rs -sSf --output rustup.sh
# TODO: switch back to nightly
- - sh rustup.sh -y --default-toolchain nightly-2019-06-10
+ - sh rustup.sh -y --default-toolchain nightly-2019-07-09
- . $HOME/.cargo/env
- rustup target add i686-unknown-freebsd
- |
+ echo "~~~~ rustc --version ~~~~"
+ rustc --version
+
# Remove any existing patch statements
mv Cargo.toml Cargo.toml.bck
sed -n '/\[patch.crates-io\]/q;p' Cargo.toml.bck > Cargo.toml
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 3387b0bf..20880950 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -2,7 +2,7 @@ trigger: ["master", "std-future"]
pr: ["master", "std-future"]
variables:
- nightly: nightly-2019-06-10
+ nightly: nightly-2019-07-09
jobs:
# Check formatting
diff --git a/tokio-sync/src/mpsc/block.rs b/tokio-sync/src/mpsc/block.rs
index dfb10a67..bf1c7b15 100644
--- a/tokio-sync/src/mpsc/block.rs
+++ b/tokio-sync/src/mpsc/block.rs
@@ -362,6 +362,7 @@ fn is_tx_closed(bits: usize) -> bool {
impl<T> Values<T> {
unsafe fn uninitialized() -> Values<T> {
+ #[allow(deprecated)]
let mut vals = mem::uninitialized();
// When fuzzing, `CausalCell` needs to be initialized.
diff --git a/tokio-sync/src/oneshot.rs b/tokio-sync/src/oneshot.rs
index c03cb4e8..910d24dd 100644
--- a/tokio-sync/src/oneshot.rs
+++ b/tokio-sync/src/oneshot.rs
@@ -112,6 +112,7 @@ struct State(usize);
/// # t.join().unwrap().wait().unwrap();
/// ```
pub fn channel<T>() -> (Sender<T>, Receiver<T>) {
+ #[allow(deprecated)]
let inner = Arc::new(Inner {
state: AtomicUsize::new(State::new().as_usize()),
value: CausalCell::new(None),
diff --git a/tokio-uds/src/ucred.rs b/tokio-uds/src/ucred.rs
index 0e74f837..57dcf9b9 100644
--- a/tokio-uds/src/ucred.rs
+++ b/tokio-uds/src/ucred.rs
@@ -90,6 +90,7 @@ pub mod impl_macos {
unsafe {
let raw_fd = sock.as_raw_fd();
+ #[allow(deprecated)]
let mut cred: super::UCred = mem::uninitialized();
let ret = getpeereid(raw_fd, &mut cred.uid, &mut cred.gid);