Merge branch 'master' into std-future

tokio-rs · Jun 5, 2019 · f6d97d1 · f6d97d1
2 parents c768196 + 8d0f102
commit f6d97d1
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml
@@ -2,8 +2,10 @@ steps:
  # Linux and macOS.
  - script: |
  set -e
- echo "Installing toolchain: $RUSTUP_TOOLCHAIN"
- curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUSTUP_TOOLCHAIN
+ curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain none
+ export PATH=$PATH:$HOME/.cargo/bin
+ rustup toolchain install $RUSTUP_TOOLCHAIN
+ rustup default $RUSTUP_TOOLCHAIN
  echo "##vso[task.setvariable variable=PATH;]$PATH:$HOME/.cargo/bin"
  env:
  RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}
@@ -13,8 +15,10 @@ steps:
  # Windows.
  - script: |
  curl -sSf -o rustup-init.exe https://win.rustup.rs
- rustup-init.exe -y --default-toolchain %RUSTUP_TOOLCHAIN%
+ rustup-init.exe -y --default-toolchain none
  set PATH=%PATH%;%USERPROFILE%\.cargo\bin
+ rustup toolchain install %RUSTUP_TOOLCHAIN%
+ rustup default %RUSTUP_TOOLCHAIN%
  echo "##vso[task.setvariable variable=PATH;]%PATH%;%USERPROFILE%\.cargo\bin"
  env:
  RUSTUP_TOOLCHAIN: ${{parameters.rust_version}}

diff --git a/ci/azure-test-nightly.yml b/ci/azure-test-nightly.yml
@@ -12,7 +12,7 @@ jobs:
  - template: azure-patch-crates.yml
 
  - script: cargo check --all
- displayName: cargo +nightly check --all
+ displayName: cargo check --all
 
  # Check benches
  - script: cargo check --benches --all

diff --git a/tokio-sync/CHANGELOG.md b/tokio-sync/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.1.6 (June 4, 2019)
+
+### Added
+- Add Sync impl for Lock (#1117).
+
 # 0.1.5 (April 22, 2019)
 
 ### Added

diff --git a/tokio-sync/README.md b/tokio-sync/README.md
@@ -2,7 +2,7 @@
 
 Synchronization utilities
 
-[Documentation](https://docs.rs/tokio-sync/0.1.5/tokio_sync/)
+[Documentation](https://docs.rs/tokio-sync/0.1.6/tokio_sync/)
 
 ## Overview
 

diff --git a/tokio-sync/src/lock.rs b/tokio-sync/src/lock.rs
@@ -69,9 +69,11 @@ pub struct Lock<T> {
 #[derive(Debug)]
 pub struct LockGuard<T>(Lock<T>);
 
-// As long as T: Send, it's fine to send Lock<T> to other threads.
-// If T was not Send, sending a Lock<T> would be bad, since you can access T through Lock<T>.
+// As long as T: Send, it's fine to send and share Lock<T> between threads.
+// If T was not Send, sending and sharing a Lock<T> would be bad, since you can access T through
+// Lock<T>.
 unsafe impl<T> Send for Lock<T> where T: Send {}
+unsafe impl<T> Sync for Lock<T> where T: Send {}
 unsafe impl<T> Sync for LockGuard<T> where T: Send + Sync {}
 
 #[derive(Debug)]

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
@@ -1,6 +1,11 @@
 This changelog only applies to the `tokio` crate proper. Each sub crate
 maintains its own changelog tracking changes made in each respective sub crate.
 
+# 0.1.21 (May 30, 2019)
+
+### Changed
+- Bump `tokio-trace-core` version to 0.2 (#1111).
+
 # 0.1.20 (May 14, 2019)
 
 ### Added

diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
@@ -13,7 +13,7 @@ edition = "2018"
 authors = ["Carl Lerche <me@carllerche.com>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/0.1.20/tokio/"
+documentation = "https://docs.rs/tokio/0.1.21/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """
@@ -76,7 +76,7 @@ tokio-threadpool = { version = "0.2.0", optional = true, path = "../tokio-thread
 tokio-tcp = { version = "0.2.0", optional = true, path = "../tokio-tcp" }
 tokio-udp = { version = "0.2.0", optional = true, path = "../tokio-udp" }
 tokio-timer = { version = "0.3.0", optional = true, path = "../tokio-timer" }
-tokio-trace-core = { version = "0.1", optional = true }
+tokio-trace-core = { version = "0.2", optional = true }
 
 # Needed until `reactor` is removed from `tokio`.
 mio = { version = "0.6.14", optional = true }

diff --git a/tokio/README.md b/tokio/README.md
@@ -28,7 +28,7 @@ the Rust programming language. It is:
 
 [Website](https://tokio.rs) |
 [Guides](https://tokio.rs/docs/getting-started/hello-world/) |
-[API Docs](https://docs.rs/tokio/0.1.19/tokio) |
+[API Docs](https://docs.rs/tokio/0.1.21/tokio) |
 [Chat](https://gitter.im/tokio-rs/tokio)
 
 ## Overview
@@ -45,9 +45,9 @@ level, it provides a few major components:
 These components provide the runtime components necessary for building
 an asynchronous application.
 
-[net]: https://docs.rs/tokio/0.1.19/tokio/net/index.html
-[reactor]: https://docs.rs/tokio/0.1.19/tokio/reactor/index.html
-[scheduler]: https://docs.rs/tokio/0.1.19/tokio/runtime/index.html
+[net]: https://docs.rs/tokio/0.1.21/tokio/net/index.html
+[reactor]: https://docs.rs/tokio/0.1.21/tokio/reactor/index.html
+[scheduler]: https://docs.rs/tokio/0.1.21/tokio/runtime/index.html
 
 ## Example