Patchwork D8358: rust-chg: depend on released version of tokio-process

login
register
mail settings
Submitter phabricator
Date April 2, 2020, 11:12 a.m.
Message ID <differential-rev-PHID-DREV-6inpzly5ruobi4retccv-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/45990/
State Superseded
Headers show

Comments

phabricator - April 2, 2020, 11:12 a.m.
yuja created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Still it is futures-0.1 based.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D8358

AFFECTED FILES
  rust/chg/Cargo.lock
  rust/chg/Cargo.toml

CHANGE DETAILS




To: yuja, #hg-reviewers
Cc: mercurial-devel
Raphaël Gomès - April 2, 2020, 12:37 p.m.
This series is great.

In case anyone wants to give their opinion, I have suggested to Yuya to 
start using async_std now that it's post-1.0 instead of Tokio. It's made 
by Tokio devs and is supposedly the better designed of the two as it 
gained hindsight from the different Tokio/futures versions of the past 
few years.

On 4/2/20 1:12 PM, yuja (Yuya Nishihara) wrote:
> yuja created this revision.
> Herald added a subscriber: mercurial-devel.
> Herald added a reviewer: hg-reviewers.
>
> REVISION SUMMARY
>    Still it is futures-0.1 based.
>
> REPOSITORY
>    rHG Mercurial
>
> BRANCH
>    default
>
> REVISION DETAIL
>    https://phab.mercurial-scm.org/D8358
>
> AFFECTED FILES
>    rust/chg/Cargo.lock
>    rust/chg/Cargo.toml
>
> CHANGE DETAILS
>
> diff --git a/rust/chg/Cargo.toml b/rust/chg/Cargo.toml
> --- a/rust/chg/Cargo.toml
> +++ b/rust/chg/Cargo.toml
> @@ -12,8 +12,7 @@
>   log = { version = "0.4", features = ["std"] }
>   tokio = "0.1"
>   tokio-hglib = "0.2"
> -# TODO: "^0.2.3" once released. we need AsRawFd support.
> -tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }
> +tokio-process = "0.2.3"
>   tokio-timer = "0.2"
>   
>   [build-dependencies]
> diff --git a/rust/chg/Cargo.lock b/rust/chg/Cargo.lock
> --- a/rust/chg/Cargo.lock
> +++ b/rust/chg/Cargo.lock
> @@ -46,7 +46,7 @@
>    "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio-hglib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
> - "tokio-process 0.2.2 (git+https://github.com/alexcrichton/tokio-process)",
> + "tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
>   ]
>   
> @@ -418,7 +418,7 @@
>    "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
> - "tokio-process 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
> + "tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
>    "tokio-uds 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
>   ]
>   
> @@ -434,22 +434,7 @@
>   
>   [[package]]
>   name = "tokio-process"
> -version = "0.2.2"
> -source = "git+https://github.com/alexcrichton/tokio-process#2e805aad57e2639246cbf7394899bf7a27c18ebd"
> -dependencies = [
> - "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
> - "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
> - "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
> - "mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
> - "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
> - "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
> - "tokio-signal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
> - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
> -]
> -
> -[[package]]
> -name = "tokio-process"
> -version = "0.2.2"
> +version = "0.2.3"
>   source = "registry+https://github.com/rust-lang/crates.io-index"
>   dependencies = [
>    "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
> @@ -669,8 +654,7 @@
>   "checksum tokio-fs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cbe4ca6e71cb0b62a66e4e6f53a8c06a6eefe46cc5f665ad6f274c9906f135"
>   "checksum tokio-hglib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a138c3cb866c8a95ceddae44634bb159eefeebcdba45aec2158f8ad6c201e6d"
>   "checksum tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "8b8a85fffbec3c5ab1ab62324570230dcd37ee5996a7859da5caf7b9d45e3e8c"
> -"checksum tokio-process 0.2.2 (git+https://github.com/alexcrichton/tokio-process)" = "<none>"
> -"checksum tokio-process 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0832648d1ff7ca42c06ca45dc76797b92c56500de828e33c77276fa1449947b6"
> +"checksum tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d"
>   "checksum tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4b26fd37f1125738b2170c80b551f69ff6fecb277e6e5ca885e53eec2b005018"
>   "checksum tokio-signal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b6893092932264944edee8486d54b578c7098bea794aedaf9bd7947b49e6b7bf"
>   "checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912"
>
>
>
> To: yuja, #hg-reviewers
> Cc: mercurial-devel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/rust/chg/Cargo.toml b/rust/chg/Cargo.toml
--- a/rust/chg/Cargo.toml
+++ b/rust/chg/Cargo.toml
@@ -12,8 +12,7 @@ 
 log = { version = "0.4", features = ["std"] }
 tokio = "0.1"
 tokio-hglib = "0.2"
-# TODO: "^0.2.3" once released. we need AsRawFd support.
-tokio-process = { git = "https://github.com/alexcrichton/tokio-process" }
+tokio-process = "0.2.3"
 tokio-timer = "0.2"
 
 [build-dependencies]
diff --git a/rust/chg/Cargo.lock b/rust/chg/Cargo.lock
--- a/rust/chg/Cargo.lock
+++ b/rust/chg/Cargo.lock
@@ -46,7 +46,7 @@ 
  "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-hglib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-process 0.2.2 (git+https://github.com/alexcrichton/tokio-process)",
+ "tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -418,7 +418,7 @@ 
  "tokio 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-process 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-uds 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -434,22 +434,7 @@ 
 
 [[package]]
 name = "tokio-process"
-version = "0.2.2"
-source = "git+https://github.com/alexcrichton/tokio-process#2e805aad57e2639246cbf7394899bf7a27c18ebd"
-dependencies = [
- "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.43 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "tokio-signal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tokio-process"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -669,8 +654,7 @@ 
 "checksum tokio-fs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5cbe4ca6e71cb0b62a66e4e6f53a8c06a6eefe46cc5f665ad6f274c9906f135"
 "checksum tokio-hglib 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8a138c3cb866c8a95ceddae44634bb159eefeebcdba45aec2158f8ad6c201e6d"
 "checksum tokio-io 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "8b8a85fffbec3c5ab1ab62324570230dcd37ee5996a7859da5caf7b9d45e3e8c"
-"checksum tokio-process 0.2.2 (git+https://github.com/alexcrichton/tokio-process)" = "<none>"
-"checksum tokio-process 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0832648d1ff7ca42c06ca45dc76797b92c56500de828e33c77276fa1449947b6"
+"checksum tokio-process 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88e1281e412013f1ff5787def044a9577a0bed059f451e835f1643201f8b777d"
 "checksum tokio-reactor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4b26fd37f1125738b2170c80b551f69ff6fecb277e6e5ca885e53eec2b005018"
 "checksum tokio-signal 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b6893092932264944edee8486d54b578c7098bea794aedaf9bd7947b49e6b7bf"
 "checksum tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7ad235e9dadd126b2d47f6736f65aa1fdcd6420e66ca63f44177bc78df89f912"