Merge #295

295: Migrate 'docopt' to 'structopt' r=ordian a=DCjanus Close #207 Co-authored-by: DCjanus <[email protected]>
killercup · May 27, 2019 · abed104 · abed104
2 parents 7335803 + 186c6dd
commit abed104
Show file tree

Hide file tree

Showing 15 changed files with 696 additions and 677 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -50,28 +50,27 @@ repository = "killercup/cargo-edit"
 repository = "killercup/cargo-edit"
 
 [dependencies]
-cargo_metadata = "0.6.0"
-docopt = "1.0"
-env_proxy = "0.2"
+cargo_metadata = "0.6.4"
+env_proxy = "0.3.1"
 error-chain = "0.12.1"
-pad = "0.1"
-regex = "1.0"
-reqwest = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
+regex = "1.1.6"
+reqwest = "0.9.17"
+serde = "1.0.91"
+serde_derive = "1.0.91"
+serde_json = "1.0.39"
 termcolor = "1.0.4"
-toml_edit = "0.1.2"
-atty = "0.2"
+toml_edit = "0.1.3"
+atty = "0.2.11"
+structopt = "0.2.15"
 
 [dependencies.semver]
 features = ["serde"]
-version = "0.9"
+version = "0.9.0"
 
 [dev-dependencies]
-assert_cli = "0.6"
-pretty_assertions = "0.5"
-tempdir = "0.3"
+assert_cli = "0.6.3"
+pretty_assertions = "0.6.1"
+tempdir = "0.3.7"
 
 [features]
 add = []

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,16 +1,22 @@
 # Appveyor config originally copied from https://github.com/seanmonstar/reqwest
 #
 # appveyor-retry makes us more resilient to random network failures.
+
+# see: https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
+# MinGW pre-installed.
+image: Visual Studio 2015
+
 environment:
   matrix:
-  - TARGET: x86_64-pc-windows-msvc
-  - TARGET: i686-pc-windows-msvc
   - TARGET: x86_64-pc-windows-gnu
   - TARGET: i686-pc-windows-gnu
+  - TARGET: x86_64-pc-windows-msvc
+  - TARGET: i686-pc-windows-msvc
 install:
   - appveyor-retry curl -sSf -o rustup-init.exe https://win.rustup.rs/
   - appveyor-retry rustup-init.exe -y --default-host %TARGET%
   - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
+  - set PATH=C:\msys64\mingw64\bin;C:\msys64\usr\bin;%PATH%
   - rustc -vV
   - cargo -vV
 build: false