Merge #207

207: various cargo dependency updates r=nikomatsakis a=vemoo

Also:
- removed `components/dada-lex/Cargo.lock` that I think may have been added by mistake
- added a comment to `components/dada-web/Cargo.toml` about `parking_lot` because I think it's only there to enable a feature that it's only needed for 0.11. So once `salsa` updates to 0.12 I think that dependency can be removed from `dada-web`

Co-authored-by: Bernardo Uriarte <[email protected]>

Cargo.toml

@@ -22,6 +22,6 @@ harness = false
 
 [dependencies]
 dada-lang = { path = "components/dada-lang" }
-eyre = "0.6.7"
+eyre = "0.6.8"
 structopt = "0.3"
 tokio = { version = "1", features = ["full"] }

components/dada-brew/Cargo.toml

@@ -14,4 +14,4 @@ dada-validate = { path = "../dada-validate" }
 dada-parse = { path = "../dada-parse" }
 extension-trait = "1"
 salsa = { path = "../salsa" }
-tracing = "0.1.29"
+tracing = "0.1.36"

components/dada-collections/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 rustc-hash = "1.1.0"
-indexmap = "1.7.0"
+indexmap = "1.9.1"
 typed-index-collections = "3.0.3"

components/dada-error-format/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ariadne = "0.1.3"
+ariadne = "0.1.5"
 dada-collections = { path = "../dada-collections" }
 dada-ir = { path = "../dada-ir" }
-eyre = "0.6.7"
+eyre = "0.6.8"
 salsa = { path = "../salsa" }

components/dada-execute/Cargo.toml

@@ -6,22 +6,22 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-arc-swap = "1.5.0"
-async-trait = "0.1.52"
-crossbeam = "0.8.1"
+arc-swap = "1.5.1"
+async-trait = "0.1.57"
+crossbeam = "0.8.2"
 dada-breakpoint = { path = "../dada-breakpoint" }
 dada-brew = { path = "../dada-brew" }
 dada-collections = { path = "../dada-collections" }
 dada-error-format = { path = "../dada-error-format" }
 dada-id = { path = "../dada-id" }
 dada-ir = { path = "../dada-ir" }
 dada-parse = { path = "../dada-parse" }
-eyre = "0.6.7"
-extension-trait = "1.0.0"
+eyre = "0.6.8"
+extension-trait = "1.0.1"
 generational-arena = "0.2.8"
-html-escape = "0.2.9"
+html-escape = "0.2.11"
 salsa = { path = "../salsa" }
-parking_lot = "0.11.2"
+parking_lot = "0.12.1"
 thiserror = "1"
 tracing = "0.1"
 typed-arena = "2.0.1"

components/dada-ir/Cargo.toml

@@ -10,4 +10,4 @@ eq-float = "=0.1.0"
 salsa = { path = "../salsa" }
 dada-id = { path = "../dada-id" }
 dada-collections = { path = "../dada-collections" }
-tracing = "0.1.29"
+tracing = "0.1.36"

components/dada-lang/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.52"
+async-trait = "0.1.57"
 dada-breakpoint = { path = "../dada-breakpoint" }
 dada-db = { path = "../dada-db" }
 dada-collections = { path = "../dada-collections" }
@@ -17,18 +17,18 @@ dada-parse = { path = "../dada-parse" }
 dada-lex = { path = "../dada-lex" }
 dada-lsp = { path = "../dada-lsp" }
 ignore = "0.4.18"
-lsp-server = "0.5.2"
-lsp-types = "0.83.1"
-eyre = "0.6.7"
-parking_lot = "0.11.2"
-regex = "1.5.4"
-serde = "1.0.131"
-serde_json = "1.0.72"
-similar = "2.1.0"
+lsp-server = "0.6.0"
+lsp-types = "0.93.0"
+eyre = "0.6.8"
+parking_lot = "0.12.1"
+regex = "1.6.0"
+serde = "1.0.143"
+serde_json = "1.0.83"
+similar = "2.2.0"
 salsa = { path = "../salsa" }
 structopt = "0.3"
 tokio = { version = "1", features = ["full"] }
-tracing = "0.1.29"
+tracing = "0.1.36"
 tracing-log = "0.1"
-tracing-tree = "0.2.0"
-tracing-subscriber = { version = "0.3.3", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
+tracing-tree = "0.2.1"
+tracing-subscriber = { version = "0.3.15", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }

components/dada-lang/src/test_harness/lsp_client.rs

@@ -135,10 +135,12 @@ impl ChildSession {
                     text_document: None,
                     window: None,
                     experimental: None,
+                    general: None,
                 },
                 trace: None,
                 workspace_folders: None,
                 client_info: None,
+                locale: None,
             },
         )?;
 
@@ -226,7 +228,8 @@ pub enum LspCommand {
     #[serde(rename = "completionItem/resolve")]
     completionItemResolve {
         id: usize,
-        params: lsp_types::CompletionItem,
+        // box to address clippy::large_enum_variant
+        params: Box<lsp_types::CompletionItem>,
     },
 }