From a4d313a07f7d54649c377aba6312900b1600ebd9 Mon Sep 17 00:00:00 2001
From: Ariel Davis <ariel.z.davis@icloud.com>
Date: Sat, 19 Aug 2023 15:56:20 -0700
Subject: [PATCH] Tweak versions

Notably this pins serde at 1.0.171, see context:

https://github.com/rust-lang/rust-analyzer/pull/15482
---
 Cargo.lock                  | 28 ++++++++++++-------------
 Cargo.toml                  | 42 ++++++++++++++++++-------------------
 crates/lang-srv/src/init.rs | 10 ++++++---
 3 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93493a5b8..65c0da138 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,9 +54,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.72"
+version = "1.0.75"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "autocfg"
@@ -313,9 +313,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
+checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -523,9 +523,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lsp-server"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ea9ae5a5082ca3b6ae824fc7666cd206b99168a4d4c769ad8fe9cc740df6a6"
+checksum = "72417faa455bfb4e5bf14b157d8e2ca2ed74b4e89b8cf42ea2d864825ae5c8a2"
 dependencies = [
  "crossbeam-channel",
  "log",
@@ -535,9 +535,9 @@ dependencies = [
 
 [[package]]
 name = "lsp-types"
-version = "0.93.2"
+version = "0.94.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be6e9c7e2d18f651974370d7aff703f9513e0df6e464fd795660edc77e6ca51"
+checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
 dependencies = [
  "bitflags 1.3.2",
  "serde",
@@ -851,18 +851,18 @@ checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
 name = "serde"
-version = "1.0.183"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32ac8da02677876d532745a130fc9d8e6edfa81a269b107c5b00829b91d8eb3c"
+checksum = "30e27d1e4fd7659406c492fd6cfaf2066ba8773de45ca75e855590f856dc34a9"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.183"
+version = "1.0.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aafe972d60b0b9bee71a91b92fee2d4fb3c9d7e8f6b179aa99f27203d99a4816"
+checksum = "389894603bd18c46fa56231694f8d827779c0951a667087194cf9de94ed24682"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -871,9 +871,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.104"
+version = "1.0.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
 dependencies = [
  "itoa",
  "ryu",
diff --git a/Cargo.toml b/Cargo.toml
index 2221b32d7..0ca234cae 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,27 +10,27 @@ publish = false
 
 [workspace.dependencies]
 # third-party
-anyhow = "1"
-better-panic = "0.3"
-codespan-reporting = "0.11"
-crossbeam-channel = "0.5"
-drop_bomb = "0.1"
-env_logger = "0.10"
-flate2 = "1"
-la-arena = "0.3"
-log = "0.4"
-lsp-server = "0.7"
-lsp-types = { version = "0.93", features = ["proposed"] }
-num-bigint = "0.4"
-num-traits = "0.2"
-once_cell = "1"
-pico-args = "0.5"
-pretty_assertions = "1"
-pulldown-cmark = "0.9"
-rowan = "0.15"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-toml = "0.7"
+anyhow = "1.0.75"
+better-panic = "0.3.0"
+codespan-reporting = "0.11.1"
+crossbeam-channel = "0.5.8"
+drop_bomb = "0.1.5"
+env_logger = "0.10.0"
+flate2 = "1.0.27"
+la-arena = "0.3.1"
+log = "0.4.20"
+lsp-server = "0.7.3"
+lsp-types = { version = "0.94.1", features = ["proposed"] }
+num-bigint = "0.4.3"
+num-traits = "0.2.16"
+once_cell = "1.18.0"
+pico-args = "0.5.0"
+pretty_assertions = "1.4.0"
+pulldown-cmark = "0.9.3"
+rowan = "0.15.11"
+serde = { version = "=1.0.171", features = ["derive"] }
+serde_json = "1.0.105"
+toml = "0.7.6"
 # language-util
 code-h2-md-map.git = "https://github.com/azdavis/language-util.git"
 diagnostic.git = "https://github.com/azdavis/language-util.git"
diff --git a/crates/lang-srv/src/init.rs b/crates/lang-srv/src/init.rs
index 9722877ee..deebaa6c5 100644
--- a/crates/lang-srv/src/init.rs
+++ b/crates/lang-srv/src/init.rs
@@ -62,9 +62,13 @@ pub(crate) fn init(init: lsp_types::InitializeParams, sender: Sender<Message>) -
     if let Mode::Root(root) = &ret.mode {
       // we'd like to only listen to millet.toml, not all toml, but "nested alternate groups are
       // not allowed" at time of writing.
-      let glob_pattern =
-        format!("{}/**/*.{{sml,sig,fun,cm,mlb,toml}}", root.path.as_path().display());
-      let watchers = vec![lsp_types::FileSystemWatcher { glob_pattern, kind: None }];
+      let watchers = vec![lsp_types::FileSystemWatcher {
+        glob_pattern: lsp_types::GlobPattern::Relative(lsp_types::RelativePattern {
+          base_uri: lsp_types::OneOf::Right(convert::file_url(root.path.as_path()).unwrap()),
+          pattern: "**/*.{sml,sig,fun,cm,mlb,toml}".to_owned(),
+        }),
+        kind: None,
+      }];
       let did_changed_registration =
         convert::registration::<lsp_types::notification::DidChangeWatchedFiles, _>(
           lsp_types::DidChangeWatchedFilesRegistrationOptions { watchers },