From 3762635fe19a9d6c6ddad0e9faa3541a23a4b15d Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 20 Sep 2022 08:42:44 -0700
Subject: [PATCH 1/3] move cli to top level

---
 .eslintignore                                         | 1 -
 build/filters.js                                      | 2 +-
 {src/cli => cli}/CONTRIBUTING.md                      | 0
 {src/cli => cli}/Cargo.lock                           | 0
 {src/cli => cli}/Cargo.toml                           | 0
 {src/cli => cli}/Cross.toml                           | 0
 {src/cli => cli}/build.rs                             | 0
 {src/cli => cli}/src/auth.rs                          | 0
 {src/cli => cli}/src/bin/code-tunnel/main.rs          | 0
 {src/cli => cli}/src/bin/code/legacy_args.rs          | 0
 {src/cli => cli}/src/bin/code/main.rs                 | 0
 {src/cli => cli}/src/commands.rs                      | 0
 {src/cli => cli}/src/commands/args.rs                 | 0
 {src/cli => cli}/src/commands/context.rs              | 0
 {src/cli => cli}/src/commands/output.rs               | 0
 {src/cli => cli}/src/commands/tunnels.rs              | 0
 {src/cli => cli}/src/commands/version.rs              | 0
 {src/cli => cli}/src/constants.rs                     | 0
 {src/cli => cli}/src/desktop.rs                       | 0
 {src/cli => cli}/src/desktop/version_manager.rs       | 0
 {src/cli => cli}/src/lib.rs                           | 0
 {src/cli => cli}/src/log.rs                           | 0
 {src/cli => cli}/src/options.rs                       | 0
 {src/cli => cli}/src/state.rs                         | 0
 {src/cli => cli}/src/tunnels.rs                       | 0
 {src/cli => cli}/src/tunnels/code_server.rs           | 0
 {src/cli => cli}/src/tunnels/control_server.rs        | 0
 {src/cli => cli}/src/tunnels/dev_tunnels.rs           | 0
 {src/cli => cli}/src/tunnels/legal.rs                 | 0
 {src/cli => cli}/src/tunnels/name_generator.rs        | 0
 {src/cli => cli}/src/tunnels/paths.rs                 | 0
 {src/cli => cli}/src/tunnels/port_forwarder.rs        | 0
 {src/cli => cli}/src/tunnels/protocol.rs              | 0
 {src/cli => cli}/src/tunnels/server_bridge_unix.rs    | 0
 {src/cli => cli}/src/tunnels/server_bridge_windows.rs | 0
 {src/cli => cli}/src/tunnels/service.rs               | 0
 {src/cli => cli}/src/tunnels/service_windows.rs       | 0
 {src/cli => cli}/src/update.rs                        | 0
 {src/cli => cli}/src/update_service.rs                | 0
 {src/cli => cli}/src/util.rs                          | 0
 {src/cli => cli}/src/util/command.rs                  | 0
 {src/cli => cli}/src/util/errors.rs                   | 0
 {src/cli => cli}/src/util/http.rs                     | 0
 {src/cli => cli}/src/util/input.rs                    | 0
 {src/cli => cli}/src/util/io.rs                       | 0
 {src/cli => cli}/src/util/machine.rs                  | 0
 {src/cli => cli}/src/util/prereqs.rs                  | 0
 {src/cli => cli}/src/util/sync.rs                     | 0
 {src/cli => cli}/src/util/tar.rs                      | 0
 {src/cli => cli}/src/util/zipper.rs                   | 0
 50 files changed, 1 insertion(+), 2 deletions(-)
 rename {src/cli => cli}/CONTRIBUTING.md (100%)
 rename {src/cli => cli}/Cargo.lock (100%)
 rename {src/cli => cli}/Cargo.toml (100%)
 rename {src/cli => cli}/Cross.toml (100%)
 rename {src/cli => cli}/build.rs (100%)
 rename {src/cli => cli}/src/auth.rs (100%)
 rename {src/cli => cli}/src/bin/code-tunnel/main.rs (100%)
 rename {src/cli => cli}/src/bin/code/legacy_args.rs (100%)
 rename {src/cli => cli}/src/bin/code/main.rs (100%)
 rename {src/cli => cli}/src/commands.rs (100%)
 rename {src/cli => cli}/src/commands/args.rs (100%)
 rename {src/cli => cli}/src/commands/context.rs (100%)
 rename {src/cli => cli}/src/commands/output.rs (100%)
 rename {src/cli => cli}/src/commands/tunnels.rs (100%)
 rename {src/cli => cli}/src/commands/version.rs (100%)
 rename {src/cli => cli}/src/constants.rs (100%)
 rename {src/cli => cli}/src/desktop.rs (100%)
 rename {src/cli => cli}/src/desktop/version_manager.rs (100%)
 rename {src/cli => cli}/src/lib.rs (100%)
 rename {src/cli => cli}/src/log.rs (100%)
 rename {src/cli => cli}/src/options.rs (100%)
 rename {src/cli => cli}/src/state.rs (100%)
 rename {src/cli => cli}/src/tunnels.rs (100%)
 rename {src/cli => cli}/src/tunnels/code_server.rs (100%)
 rename {src/cli => cli}/src/tunnels/control_server.rs (100%)
 rename {src/cli => cli}/src/tunnels/dev_tunnels.rs (100%)
 rename {src/cli => cli}/src/tunnels/legal.rs (100%)
 rename {src/cli => cli}/src/tunnels/name_generator.rs (100%)
 rename {src/cli => cli}/src/tunnels/paths.rs (100%)
 rename {src/cli => cli}/src/tunnels/port_forwarder.rs (100%)
 rename {src/cli => cli}/src/tunnels/protocol.rs (100%)
 rename {src/cli => cli}/src/tunnels/server_bridge_unix.rs (100%)
 rename {src/cli => cli}/src/tunnels/server_bridge_windows.rs (100%)
 rename {src/cli => cli}/src/tunnels/service.rs (100%)
 rename {src/cli => cli}/src/tunnels/service_windows.rs (100%)
 rename {src/cli => cli}/src/update.rs (100%)
 rename {src/cli => cli}/src/update_service.rs (100%)
 rename {src/cli => cli}/src/util.rs (100%)
 rename {src/cli => cli}/src/util/command.rs (100%)
 rename {src/cli => cli}/src/util/errors.rs (100%)
 rename {src/cli => cli}/src/util/http.rs (100%)
 rename {src/cli => cli}/src/util/input.rs (100%)
 rename {src/cli => cli}/src/util/io.rs (100%)
 rename {src/cli => cli}/src/util/machine.rs (100%)
 rename {src/cli => cli}/src/util/prereqs.rs (100%)
 rename {src/cli => cli}/src/util/sync.rs (100%)
 rename {src/cli => cli}/src/util/tar.rs (100%)
 rename {src/cli => cli}/src/util/zipper.rs (100%)

diff --git a/.eslintignore b/.eslintignore
index 90648aa3963..e3aedfea0d6 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -28,4 +28,3 @@
 **/src/vs/loader.js
 **/test/unit/assert.js
 **/typings/**
-**/src/cli/**
diff --git a/build/filters.js b/build/filters.js
index 8fd72e05471..ff8e4ef81b3 100644
--- a/build/filters.js
+++ b/build/filters.js
@@ -22,7 +22,7 @@ module.exports.all = [
 	'scripts/**/*',
 	'src/**/*',
 	'test/**/*',
-	'!src/cli/**/*',
+	'!cli/**/*',
 	'!out*/**',
 	'!test/**/out/**',
 	'!**/node_modules/**',
diff --git a/src/cli/CONTRIBUTING.md b/cli/CONTRIBUTING.md
similarity index 100%
rename from src/cli/CONTRIBUTING.md
rename to cli/CONTRIBUTING.md
diff --git a/src/cli/Cargo.lock b/cli/Cargo.lock
similarity index 100%
rename from src/cli/Cargo.lock
rename to cli/Cargo.lock
diff --git a/src/cli/Cargo.toml b/cli/Cargo.toml
similarity index 100%
rename from src/cli/Cargo.toml
rename to cli/Cargo.toml
diff --git a/src/cli/Cross.toml b/cli/Cross.toml
similarity index 100%
rename from src/cli/Cross.toml
rename to cli/Cross.toml
diff --git a/src/cli/build.rs b/cli/build.rs
similarity index 100%
rename from src/cli/build.rs
rename to cli/build.rs
diff --git a/src/cli/src/auth.rs b/cli/src/auth.rs
similarity index 100%
rename from src/cli/src/auth.rs
rename to cli/src/auth.rs
diff --git a/src/cli/src/bin/code-tunnel/main.rs b/cli/src/bin/code-tunnel/main.rs
similarity index 100%
rename from src/cli/src/bin/code-tunnel/main.rs
rename to cli/src/bin/code-tunnel/main.rs
diff --git a/src/cli/src/bin/code/legacy_args.rs b/cli/src/bin/code/legacy_args.rs
similarity index 100%
rename from src/cli/src/bin/code/legacy_args.rs
rename to cli/src/bin/code/legacy_args.rs
diff --git a/src/cli/src/bin/code/main.rs b/cli/src/bin/code/main.rs
similarity index 100%
rename from src/cli/src/bin/code/main.rs
rename to cli/src/bin/code/main.rs
diff --git a/src/cli/src/commands.rs b/cli/src/commands.rs
similarity index 100%
rename from src/cli/src/commands.rs
rename to cli/src/commands.rs
diff --git a/src/cli/src/commands/args.rs b/cli/src/commands/args.rs
similarity index 100%
rename from src/cli/src/commands/args.rs
rename to cli/src/commands/args.rs
diff --git a/src/cli/src/commands/context.rs b/cli/src/commands/context.rs
similarity index 100%
rename from src/cli/src/commands/context.rs
rename to cli/src/commands/context.rs
diff --git a/src/cli/src/commands/output.rs b/cli/src/commands/output.rs
similarity index 100%
rename from src/cli/src/commands/output.rs
rename to cli/src/commands/output.rs
diff --git a/src/cli/src/commands/tunnels.rs b/cli/src/commands/tunnels.rs
similarity index 100%
rename from src/cli/src/commands/tunnels.rs
rename to cli/src/commands/tunnels.rs
diff --git a/src/cli/src/commands/version.rs b/cli/src/commands/version.rs
similarity index 100%
rename from src/cli/src/commands/version.rs
rename to cli/src/commands/version.rs
diff --git a/src/cli/src/constants.rs b/cli/src/constants.rs
similarity index 100%
rename from src/cli/src/constants.rs
rename to cli/src/constants.rs
diff --git a/src/cli/src/desktop.rs b/cli/src/desktop.rs
similarity index 100%
rename from src/cli/src/desktop.rs
rename to cli/src/desktop.rs
diff --git a/src/cli/src/desktop/version_manager.rs b/cli/src/desktop/version_manager.rs
similarity index 100%
rename from src/cli/src/desktop/version_manager.rs
rename to cli/src/desktop/version_manager.rs
diff --git a/src/cli/src/lib.rs b/cli/src/lib.rs
similarity index 100%
rename from src/cli/src/lib.rs
rename to cli/src/lib.rs
diff --git a/src/cli/src/log.rs b/cli/src/log.rs
similarity index 100%
rename from src/cli/src/log.rs
rename to cli/src/log.rs
diff --git a/src/cli/src/options.rs b/cli/src/options.rs
similarity index 100%
rename from src/cli/src/options.rs
rename to cli/src/options.rs
diff --git a/src/cli/src/state.rs b/cli/src/state.rs
similarity index 100%
rename from src/cli/src/state.rs
rename to cli/src/state.rs
diff --git a/src/cli/src/tunnels.rs b/cli/src/tunnels.rs
similarity index 100%
rename from src/cli/src/tunnels.rs
rename to cli/src/tunnels.rs
diff --git a/src/cli/src/tunnels/code_server.rs b/cli/src/tunnels/code_server.rs
similarity index 100%
rename from src/cli/src/tunnels/code_server.rs
rename to cli/src/tunnels/code_server.rs
diff --git a/src/cli/src/tunnels/control_server.rs b/cli/src/tunnels/control_server.rs
similarity index 100%
rename from src/cli/src/tunnels/control_server.rs
rename to cli/src/tunnels/control_server.rs
diff --git a/src/cli/src/tunnels/dev_tunnels.rs b/cli/src/tunnels/dev_tunnels.rs
similarity index 100%
rename from src/cli/src/tunnels/dev_tunnels.rs
rename to cli/src/tunnels/dev_tunnels.rs
diff --git a/src/cli/src/tunnels/legal.rs b/cli/src/tunnels/legal.rs
similarity index 100%
rename from src/cli/src/tunnels/legal.rs
rename to cli/src/tunnels/legal.rs
diff --git a/src/cli/src/tunnels/name_generator.rs b/cli/src/tunnels/name_generator.rs
similarity index 100%
rename from src/cli/src/tunnels/name_generator.rs
rename to cli/src/tunnels/name_generator.rs
diff --git a/src/cli/src/tunnels/paths.rs b/cli/src/tunnels/paths.rs
similarity index 100%
rename from src/cli/src/tunnels/paths.rs
rename to cli/src/tunnels/paths.rs
diff --git a/src/cli/src/tunnels/port_forwarder.rs b/cli/src/tunnels/port_forwarder.rs
similarity index 100%
rename from src/cli/src/tunnels/port_forwarder.rs
rename to cli/src/tunnels/port_forwarder.rs
diff --git a/src/cli/src/tunnels/protocol.rs b/cli/src/tunnels/protocol.rs
similarity index 100%
rename from src/cli/src/tunnels/protocol.rs
rename to cli/src/tunnels/protocol.rs
diff --git a/src/cli/src/tunnels/server_bridge_unix.rs b/cli/src/tunnels/server_bridge_unix.rs
similarity index 100%
rename from src/cli/src/tunnels/server_bridge_unix.rs
rename to cli/src/tunnels/server_bridge_unix.rs
diff --git a/src/cli/src/tunnels/server_bridge_windows.rs b/cli/src/tunnels/server_bridge_windows.rs
similarity index 100%
rename from src/cli/src/tunnels/server_bridge_windows.rs
rename to cli/src/tunnels/server_bridge_windows.rs
diff --git a/src/cli/src/tunnels/service.rs b/cli/src/tunnels/service.rs
similarity index 100%
rename from src/cli/src/tunnels/service.rs
rename to cli/src/tunnels/service.rs
diff --git a/src/cli/src/tunnels/service_windows.rs b/cli/src/tunnels/service_windows.rs
similarity index 100%
rename from src/cli/src/tunnels/service_windows.rs
rename to cli/src/tunnels/service_windows.rs
diff --git a/src/cli/src/update.rs b/cli/src/update.rs
similarity index 100%
rename from src/cli/src/update.rs
rename to cli/src/update.rs
diff --git a/src/cli/src/update_service.rs b/cli/src/update_service.rs
similarity index 100%
rename from src/cli/src/update_service.rs
rename to cli/src/update_service.rs
diff --git a/src/cli/src/util.rs b/cli/src/util.rs
similarity index 100%
rename from src/cli/src/util.rs
rename to cli/src/util.rs
diff --git a/src/cli/src/util/command.rs b/cli/src/util/command.rs
similarity index 100%
rename from src/cli/src/util/command.rs
rename to cli/src/util/command.rs
diff --git a/src/cli/src/util/errors.rs b/cli/src/util/errors.rs
similarity index 100%
rename from src/cli/src/util/errors.rs
rename to cli/src/util/errors.rs
diff --git a/src/cli/src/util/http.rs b/cli/src/util/http.rs
similarity index 100%
rename from src/cli/src/util/http.rs
rename to cli/src/util/http.rs
diff --git a/src/cli/src/util/input.rs b/cli/src/util/input.rs
similarity index 100%
rename from src/cli/src/util/input.rs
rename to cli/src/util/input.rs
diff --git a/src/cli/src/util/io.rs b/cli/src/util/io.rs
similarity index 100%
rename from src/cli/src/util/io.rs
rename to cli/src/util/io.rs
diff --git a/src/cli/src/util/machine.rs b/cli/src/util/machine.rs
similarity index 100%
rename from src/cli/src/util/machine.rs
rename to cli/src/util/machine.rs
diff --git a/src/cli/src/util/prereqs.rs b/cli/src/util/prereqs.rs
similarity index 100%
rename from src/cli/src/util/prereqs.rs
rename to cli/src/util/prereqs.rs
diff --git a/src/cli/src/util/sync.rs b/cli/src/util/sync.rs
similarity index 100%
rename from src/cli/src/util/sync.rs
rename to cli/src/util/sync.rs
diff --git a/src/cli/src/util/tar.rs b/cli/src/util/tar.rs
similarity index 100%
rename from src/cli/src/util/tar.rs
rename to cli/src/util/tar.rs
diff --git a/src/cli/src/util/zipper.rs b/cli/src/util/zipper.rs
similarity index 100%
rename from src/cli/src/util/zipper.rs
rename to cli/src/util/zipper.rs

From a9e38fe9257ccbd73fce1c1d8f35aa1f41ccf644 Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 20 Sep 2022 08:49:29 -0700
Subject: [PATCH 2/3] ignore rust code when doing hygenie check

---
 .gitignore       | 1 +
 build/hygiene.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 738d6793fa9..c338e141c8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ yarn-error.log
 vscode.lsif
 vscode.db
 /.profile-oss
+/cli/target
diff --git a/build/hygiene.js b/build/hygiene.js
index 99b757e6d76..67f074c4ac0 100644
--- a/build/hygiene.js
+++ b/build/hygiene.js
@@ -10,6 +10,7 @@ const vfs = require('vinyl-fs');
 const path = require('path');
 const fs = require('fs');
 const pall = require('p-all');
+
 const { all, copyrightFilter, unicodeFilter, indentationFilter, tsFormattingFilter, eslintFilter } = require('./filters');
 
 const copyrightHeaderLines = [
@@ -291,7 +292,7 @@ if (require.main === module) {
 						.then(
 							(vinyls) =>
 								new Promise((c, e) =>
-									hygiene(es.readArray(vinyls))
+									hygiene(es.readArray(vinyls).pipe(filter(all)))
 										.on('end', () => c())
 										.on('error', e)
 								)

From 5b24e93b357321db1c1d3f0cb11e81ca144405ef Mon Sep 17 00:00:00 2001
From: Connor Peet <connor@peet.io>
Date: Tue, 20 Sep 2022 08:57:55 -0700
Subject: [PATCH 3/3] cli: update problematic dependencies

---
 cli/Cargo.lock | 107 ++++++++++++++++++++-----------------------------
 cli/Cargo.toml |   2 +-
 2 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/cli/Cargo.lock b/cli/Cargo.lock
index 64f07ae0a72..cc6b94be2f4 100644
--- a/cli/Cargo.lock
+++ b/cli/Cargo.lock
@@ -35,7 +35,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfe0133578c0986e1fe3dfcd4af1cc5b2dd6c3dbf534d69916ce16a2701d40ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cipher 0.4.3",
  "cpufeatures",
 ]
@@ -260,12 +260,6 @@ version = "1.0.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -278,7 +272,7 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7fc89c7c5b9e7a02dfe45cd2367bae382f9ed31c61ca8debe5f827c420a2f08"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cipher 0.4.3",
  "cpufeatures",
 ]
@@ -292,7 +286,6 @@ dependencies = [
  "libc",
  "num-integer",
  "num-traits",
- "rustc-serialize",
  "serde",
  "time",
  "winapi",
@@ -462,7 +455,7 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -471,7 +464,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
 ]
 
@@ -481,7 +474,7 @@ version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
@@ -492,7 +485,7 @@ version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crossbeam-utils",
  "lazy_static",
  "memoffset",
@@ -505,7 +498,7 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "lazy_static",
 ]
 
@@ -680,7 +673,7 @@ version = "0.8.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -733,7 +726,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "winapi",
@@ -745,7 +738,7 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crc32fast",
  "libc",
  "miniz_oxide",
@@ -911,7 +904,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -922,7 +915,7 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.10.0+wasi-snapshot-preview1",
 ]
@@ -1131,7 +1124,7 @@ version = "0.1.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1194,7 +1187,7 @@ version = "0.4.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1276,15 +1269,15 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.17.0"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363"
+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
 dependencies = [
  "bitflags",
  "cc",
- "cfg-if 0.1.10",
+ "cfg-if",
  "libc",
- "void",
+ "memoffset",
 ]
 
 [[package]]
@@ -1429,7 +1422,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
 dependencies = [
  "bitflags",
- "cfg-if 1.0.0",
+ "cfg-if",
  "foreign-types",
  "libc",
  "once_cell",
@@ -1569,9 +1562,9 @@ checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1583,7 +1576,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
@@ -1636,9 +1629,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -1658,7 +1651,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "log",
  "wepoll-ffi",
@@ -1682,7 +1675,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ef234e08c11dfcb2e56f79fd70f6f2eb7f025c0ce2333e82f4f0518ecad30c6"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "opaque-debug",
  "universal-hash",
@@ -2032,12 +2025,6 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "rustc-serialize"
-version = "0.3.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
-
 [[package]]
 name = "rustversion"
 version = "1.0.9"
@@ -2184,7 +2171,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.3",
 ]
@@ -2195,7 +2182,7 @@ version = "0.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c77f4e7f65455545c2153c1253d25056825e77ee2533f0e41deb65a93a34852f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.3",
 ]
@@ -2207,7 +2194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
@@ -2219,7 +2206,7 @@ version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.3",
 ]
@@ -2308,7 +2295,7 @@ version = "0.23.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07fa4c84a5305909b0eedfcc8d1f2fafdbede645bb700a45ecaafe681a0ac5d6"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
@@ -2334,7 +2321,7 @@ version = "3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand",
  "libc",
  "redox_syscall",
@@ -2526,22 +2513,22 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
 
 [[package]]
 name = "tracing"
-version = "0.1.32"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f"
+checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "pin-project-lite",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.22"
+version = "0.1.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23"
+checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
 dependencies = [
- "lazy_static",
+ "once_cell",
 ]
 
 [[package]]
@@ -2681,12 +2668,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
 [[package]]
 name = "waker-fn"
 version = "1.1.0"
@@ -2727,7 +2708,7 @@ version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "wasm-bindgen-macro",
 ]
 
@@ -2752,7 +2733,7 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -2971,9 +2952,9 @@ dependencies = [
 
 [[package]]
 name = "zbus"
-version = "1.9.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad"
+checksum = "9cbeb2291cd7267a94489b71376eda33496c1b9881adf6b36f26cc2779f3fc49"
 dependencies = [
  "async-io",
  "byteorder",
@@ -2994,9 +2975,9 @@ dependencies = [
 
 [[package]]
 name = "zbus_macros"
-version = "1.9.1"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93"
+checksum = "fa3959a7847cf95e3d51e312856617c5b1b77191176c65a79a5f14d778bbe0a6"
 dependencies = [
  "proc-macro-crate 0.1.5",
  "proc-macro2",
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index f9089068950..808eeecbe6b 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -36,7 +36,7 @@ atty = "0.2.14"
 opentelemetry = { version = "0.18.0", features = ["rt-tokio"] }
 opentelemetry-application-insights = { version = "0.22.0", features = ["reqwest-client-vendored-tls"] }
 serde_bytes = "0.11.5"
-chrono = { version = "0.4", features = ["serde", "rustc-serialize"] }
+chrono = { version = "0.4", features = ["serde"] }
 gethostname = "0.2.3"
 libc = "0.2"
 tunnels = { git = "https://github.com/connor4312/dev-tunnels", branch = "host-relay", features = ["connections", "vendored-openssl"] }