From baa2fc2a3507faa9343e8ae9f8fc2e7fca5e2a25 Mon Sep 17 00:00:00 2001
From: Joshua Batty <joshpbatty@gmail.com>
Date: Tue, 31 Jan 2023 12:26:57 +1100
Subject: [PATCH] Bump `toml-edit` and `tower-lsp` to latest versions (#3933)

---
 Cargo.lock          | 61 ++++++++++++++++++++-------------------------
 forc/Cargo.toml     |  2 +-
 sway-lsp/Cargo.toml |  4 +--
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 27e93d82960..1f561b2fdfd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -166,18 +166,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "auto_impl"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7862e21c893d65a1650125d157eaeec691439379a1cee17ee49031b79236ada4"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "auto_impl"
 version = "1.0.1"
@@ -699,16 +687,6 @@ dependencies = [
  "unreachable",
 ]
 
-[[package]]
-name = "combine"
-version = "4.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
-dependencies = [
- "bytes",
- "memchr",
-]
-
 [[package]]
 name = "comrak"
 version = "0.15.0"
@@ -2186,7 +2164,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2ebc8013b4426d5b81a4364c419a95ed0b404af2b82e2457de52d9348f0e474"
 dependencies = [
- "combine 3.8.1",
+ "combine",
  "thiserror",
 ]
 
@@ -2930,6 +2908,15 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "nom8"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "notify"
 version = "5.0.0"
@@ -3811,7 +3798,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73d84c8f9836efb0f5f5f8de4700a953c4e1f3119e5cfcb0aad8e5be73daf991"
 dependencies = [
  "arrayref",
- "auto_impl 1.0.1",
+ "auto_impl",
  "bytes",
  "hashbrown 0.13.1",
  "num_enum",
@@ -5083,15 +5070,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
+
 [[package]]
 name = "toml_edit"
-version = "0.14.4"
+version = "0.19.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f"
+checksum = "90a238ee2e6ede22fb95350acc78e21dc40da00bb66c0334bde83de4ed89424e"
 dependencies = [
- "combine 4.6.6",
  "indexmap",
- "itertools",
+ "nom8",
+ "toml_datetime",
 ]
 
 [[package]]
@@ -5122,17 +5115,16 @@ checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
 
 [[package]]
 name = "tower-lsp"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43e094780b4447366c59f79acfd65b1375ecaa84e61dddbde1421aa506334024"
+checksum = "7d0ad391e4e58fccec398abd3da22d5e59fbcbae8d036df0d00dfd9703c7ee96"
 dependencies = [
  "async-trait",
- "auto_impl 0.5.0",
+ "auto_impl",
  "bytes",
  "dashmap",
  "futures",
  "httparse",
- "log",
  "lsp-types",
  "memchr",
  "serde",
@@ -5141,13 +5133,14 @@ dependencies = [
  "tokio-util",
  "tower",
  "tower-lsp-macros",
+ "tracing",
 ]
 
 [[package]]
 name = "tower-lsp-macros"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebd99eec668d0a450c177acbc4d05e0d0d13b1f8d3db13cd706c52cbec4ac04"
+checksum = "74697a0324a76eedfc784ffef1cc4de2300af19720de3c3fd99cd7ec484479da"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/forc/Cargo.toml b/forc/Cargo.toml
index a710b40b90a..40e30f5b4c4 100644
--- a/forc/Cargo.toml
+++ b/forc/Cargo.toml
@@ -37,7 +37,7 @@ sway-utils = { version = "0.33.1", path = "../sway-utils" }
 term-table = "1.3"
 tokio = { version = "1.8.0", features = ["macros", "rt-multi-thread"] }
 toml = "0.5"
-toml_edit = "0.14.4"
+toml_edit = "0.19"
 tracing = "0.1"
 url = "2.2"
 uwuify = { version = "^0.2", optional = true }
diff --git a/sway-lsp/Cargo.toml b/sway-lsp/Cargo.toml
index be9e5b5543e..cc9ba53f809 100644
--- a/sway-lsp/Cargo.toml
+++ b/sway-lsp/Cargo.toml
@@ -29,8 +29,8 @@ swayfmt = { version = "0.33.1", path = "../swayfmt" }
 tempfile = "3"
 thiserror = "1.0.30"
 tokio = { version = "1.3", features = ["io-std", "io-util", "macros", "net", "rt-multi-thread", "sync", "time"] }
-toml_edit = "0.14.4"
-tower-lsp = { version = "0.17", features = ["proposed"] }
+toml_edit = "0.19"
+tower-lsp = { version = "0.18", features = ["proposed"] }
 tracing = "0.1"
 
 [dev-dependencies]