From 513da0fdd1ac28a0b11f60ca4318b24f9676aca9 Mon Sep 17 00:00:00 2001
From: messense <messense@icloud.com>
Date: Thu, 24 Nov 2022 22:33:14 +0800
Subject: [PATCH] Bump MSRV to 1.62.0

---
 .github/workflows/test.yml |  2 +-
 Cargo.lock                 | 29 ++++++++++++++++++-----------
 Cargo.toml                 |  8 ++++----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 791aee5a6..b6265fc3e 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -478,7 +478,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: dtolnay/rust-toolchain@1.61.0
+      - uses: dtolnay/rust-toolchain@1.62.0
       # Caching
       - name: Cache cargo build
         uses: Swatinem/rust-cache@v2
diff --git a/Cargo.lock b/Cargo.lock
index 279df9fd3..330da0948 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -166,7 +166,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.5.4",
  "object",
  "rustc-demangle",
 ]
@@ -327,9 +327,9 @@ dependencies = [
 
 [[package]]
 name = "cargo-xwin"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fff9dcba0018e9156cfb5802be23e5e1e4edf228e7b09034dcf0f4fb4b9a2d2a"
+checksum = "84ea5370ab5eae7b28393674773c0ff5aed52aae2f7ca35649a1dd45f3e04e2d"
 dependencies = [
  "anyhow",
  "cargo-options",
@@ -466,7 +466,6 @@ dependencies = [
  "once_cell",
  "strsim",
  "termcolor",
- "terminal_size 0.2.2",
  "textwrap",
 ]
 
@@ -1001,12 +1000,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.24"
+version = "1.0.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.6.2",
 ]
 
 [[package]]
@@ -1601,6 +1600,15 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "msi"
 version = "0.5.0"
@@ -2710,7 +2718,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 dependencies = [
  "smawk",
- "terminal_size 0.2.2",
  "unicode-linebreak",
  "unicode-width",
 ]
@@ -3367,15 +3374,15 @@ dependencies = [
 
 [[package]]
 name = "xwin"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19d800084cf7137e4a3e80587ff027d53943e05586a50a3655c2622e6700ba3f"
+checksum = "025e692f4ac32316c2a7e13d04a2e42108f110d087d022f4a971c882514ea88b"
 dependencies = [
  "anyhow",
  "bytes",
  "cab",
  "camino",
- "clap 3.2.23",
+ "clap 4.0.26",
  "cli-table",
  "flate2",
  "indicatif",
diff --git a/Cargo.toml b/Cargo.toml
index cfff1fba1..45af58fa2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
 keywords = ["python", "cffi", "packaging", "pypi", "pyo3"]
 categories = ["api-bindings", "development-tools::ffi", "command-line-utilities"]
 edition = "2021"
-rust-version = "1.61"
+rust-version = "1.62"
 
 [[bin]]
 name = "maturin"
@@ -26,7 +26,7 @@ glob = "0.3.0"
 cargo_metadata = "0.15.2"
 cargo-options = "0.5.2"
 cargo-zigbuild = "0.14.1"
-cargo-xwin = { version = "0.12.2", default-features = false }
+cargo-xwin = { version = "0.13.0", default-features = false }
 cbindgen = { version = "0.24.2", default-features = false }
 uniffi_bindgen = "0.21.0"
 flate2 = "1.0.18"
@@ -34,11 +34,11 @@ goblin = "0.6.0"
 human-panic = { version = "1.0.3", optional = true }
 keyring = { version = "1.1.1", optional = true }
 platform-info = "1.0.0"
-regex = "1.4.5"
+regex = "1.7.0"
 serde = { version = "1.0.141", features = ["derive"] }
 serde_json = "1.0.80"
 sha2 = "0.10.3"
-tar = "0.4.33"
+tar = "0.4.38"
 tempfile = "3.2.0"
 toml_edit = { version = "0.15.0", features = ["easy"] }
 zip = { version = "0.6.1", default-features = false, features = ["bzip2", "deflate", "time"] }