Upgrade rust/crates/tokio-macros to 0.3.1 am: a2245f7b26 am: 22e9a98c65

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/tokio-macros/+/1479548

Change-Id: I27608c7b60c35ac356fa167ec4d33ce2f4253513

8 files changed, 55 insertions, 22 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
new file mode 100644
index 0000000..1024f0a
--- /dev/null
+++ b/.cargo_vcs_info.json
@@ -0,0 +1,5 @@
+{
+  "git": {
+    "sha1": "1c28c3b0a867b0147293055fe648d1185f9648a9"
+  }
+}
diff --git a/Android.bp b/Android.bp
index 51f7775..01f7b5a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -23,11 +23,35 @@ rust_test_host {
         "libproc_macro2",
         "libquote",
         "libsyn",
+        "libtokio",
     ],
 }
 
 // dependent_library ["feature_list"]
+//   arc-swap-0.4.7
+//   bytes-0.6.0 "default,std"
+//   cfg-if-0.1.10
+//   cfg-if-1.0.0
+//   fnv-1.0.7 "default,std"
+//   futures-core-0.3.7 "alloc,default,std"
+//   instant-0.1.8
+//   lazy_static-1.4.0
+//   libc-0.2.80 "default,std"
+//   lock_api-0.4.1
+//   log-0.4.11
+//   memchr-2.3.4 "default,std"
+//   mio-0.7.4 "default,os-poll,os-util,tcp,udp,uds"
+//   num_cpus-1.13.0
+//   parking_lot-0.11.0 "default"
+//   parking_lot_core-0.8.0
+//   pin-project-lite-0.1.11
 //   proc-macro2-1.0.24 "default,proc-macro"
 //   quote-1.0.7 "default,proc-macro"
-//   syn-1.0.46 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+//   scopeguard-1.1.0
+//   signal-hook-registry-1.2.1
+//   slab-0.4.2
+//   smallvec-1.4.2
+//   syn-1.0.48 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote"
+//   tokio-0.3.2 "bytes,default,fnv,fs,full,futures-core,io-std,io-util,lazy_static,libc,macros,memchr,mio,net,num_cpus,parking_lot,process,rt,rt-multi-thread,signal,signal-hook-registry,slab,stream,sync,time,tokio-macros,winapi"
+//   tokio-macros-0.3.1
 //   unicode-xid-0.2.1 "default"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76afcbe..50dfc39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.3.1 (October 25, 2020)
+
+### Fixed
+
+- fix incorrect docs regarding `max_threads` option ([#3038])
+
 # 0.3.0 (October 15, 2020)
 
 - Track `tokio` 0.3 release.
@@ -38,9 +44,10 @@
 
 - Initial release
 
-[#2225]: https://github.com/tokio-rs/tokio/pull/2225
-[#2177]: https://github.com/tokio-rs/tokio/pull/2177
-[#2152]: https://github.com/tokio-rs/tokio/pull/2152
-[#2038]: https://github.com/tokio-rs/tokio/pull/2038
-[#2022]: https://github.com/tokio-rs/tokio/pull/2022
 [#1954]: https://github.com/tokio-rs/tokio/pull/1954
+[#2022]: https://github.com/tokio-rs/tokio/pull/2022
+[#2038]: https://github.com/tokio-rs/tokio/pull/2038
+[#2152]: https://github.com/tokio-rs/tokio/pull/2152
+[#2177]: https://github.com/tokio-rs/tokio/pull/2177
+[#2225]: https://github.com/tokio-rs/tokio/pull/2225
+[#3038]: https://github.com/tokio-rs/tokio/pull/3038
diff --git a/Cargo.toml b/Cargo.toml
index 759c0bf..b702b0f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,11 +13,11 @@
 [package]
 edition = "2018"
 name = "tokio-macros"
-version = "0.3.0"
+version = "0.3.1"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 description = "Tokio's proc macros.\n"
 homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-macros/0.3.0/tokio_macros"
+documentation = "https://docs.rs/tokio-macros/0.3.1/tokio_macros"
 categories = ["asynchronous"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/tokio"
@@ -35,7 +35,8 @@ version = "1"
 [dependencies.syn]
 version = "1.0.3"
 features = ["full"]
-
-[dev-dependencies]
+[dev-dependencies.tokio]
+version = "0.3.0"
+features = ["full"]
 
 [features]
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index f93cc3e..5a594e7 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -7,13 +7,13 @@ name = "tokio-macros"
 #   - Cargo.toml
 # - Update CHANGELOG.md.
 # - Create "v0.3.x" git tag.
-version = "0.3.0"
+version = "0.3.1"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
-documentation = "https://docs.rs/tokio-macros/0.3.0/tokio_macros"
+documentation = "https://docs.rs/tokio-macros/0.3.1/tokio_macros"
 description = """
 Tokio's proc macros.
 """
@@ -30,7 +30,7 @@ quote = "1"
 syn = { version = "1.0.3", features = ["full"] }
 
 [dev-dependencies]
-# tokio = { version = "0.3.0", path = "../tokio", features = ["full"] }
+tokio = { version = "0.3.0", path = "../tokio", features = ["full"] }
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/METADATA b/METADATA
index 228939b..adc2084 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/tokio-macros/tokio-macros-0.3.0.crate"
+    value: "https://static.crates.io/crates/tokio-macros/tokio-macros-0.3.1.crate"
   }
-  version: "0.3.0"
+  version: "0.3.1"
   license_type: NOTICE
   last_upgrade_date {
     year: 2020
     month: 10
-    day: 23
+    day: 28
   }
 }
diff --git a/src/entry.rs b/src/entry.rs
index 8eb184a..f5c62a4 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -179,7 +179,7 @@ fn parse_knobs(
                         return Err(syn::Error::new_spanned(namevalue, msg));
                     }
                     name => {
-                        let msg = format!("Unknown attribute {} is specified; expected one of: `flavor`, `worker_threads`, `max_threads`", name);
+                        let msg = format!("Unknown attribute {} is specified; expected one of: `flavor`, `worker_threads`", name);
                         return Err(syn::Error::new_spanned(namevalue, msg));
                     }
                 }
diff --git a/src/lib.rs b/src/lib.rs
index 47d780a..5172258 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio-macros/0.3.0")]
+#![doc(html_root_url = "https://docs.rs/tokio-macros/0.3.1")]
 #![allow(clippy::needless_doctest_main)]
 #![warn(
     missing_debug_implementations,
@@ -231,10 +231,6 @@ pub fn test(args: TokenStream, item: TokenStream) -> TokenStream {
 
 /// Marks async function to be executed by runtime, suitable to test environment
 ///
-/// ## Options:
-///
-/// - `max_threads=n` - Sets max threads to `n`.
-///
 /// ## Usage
 ///
 /// ```no_run