chore: bump more dependencies

Cargo.toml

@@ -120,9 +120,8 @@ ark-std = { version = "^0.5.0", default-features = false }
 iter-extended = { path = "utils/iter-extended" }
 
 # LSP
-async-lsp = { version = "0.1.0", default-features = false }
-lsp-types = "0.94.1"
-tower = "0.4"
+async-lsp = { version = "0.2.2", default-features = false }
+tower = "0.5"
 
 # Wasm
 wasm-bindgen = { version = "=0.2.100", features = ["serde-serialize"] }
@@ -161,7 +160,7 @@ cfg-if = "1.0.0"
 dirs = "4"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0"
-smol_str = { version = "0.1.17", features = ["serde"] }
+smol_str = { version = "0.3.2", features = ["serde"] }
 thiserror = "1.0.21"
 toml = "0.7.2"
 url = "2.5.4"

acvm-repo/blackbox_solver/Cargo.toml

@@ -24,14 +24,14 @@ blake2 = "0.10.6"
 blake3 = "1.5.0"
 sha2.workspace = true
 keccak = "0.1.4"
-k256 = { version = "0.11.0", features = [
+k256 = { version = "0.13.4", features = [
     "ecdsa",
     "ecdsa-core",
     "sha256",
     "digest",
     "arithmetic",
 ] }
-p256 = { version = "0.11.0", features = [
+p256 = { version = "0.13.2", features = [
     "ecdsa",
     "ecdsa-core",
     "sha256",

acvm-repo/blackbox_solver/src/ecdsa/secp256k1.rs

@@ -5,7 +5,7 @@ use blake2::digest::generic_array::GenericArray;
 use k256::{
     AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
     elliptic_curve::{
-        IsHigh,
+        scalar::IsHigh,
         sec1::{Coordinates, ToEncodedPoint},
     },
 };

acvm-repo/blackbox_solver/src/ecdsa/secp256r1.rs

@@ -5,7 +5,7 @@ use blake2::digest::generic_array::GenericArray;
 use p256::{
     AffinePoint, EncodedPoint, ProjectivePoint, PublicKey,
     elliptic_curve::{
-        IsHigh,
+        scalar::IsHigh,
         sec1::{Coordinates, ToEncodedPoint},
     },
 };

compiler/noirc_frontend/Cargo.toml

@@ -23,7 +23,7 @@ serde_json.workspace = true
 serde.workspace = true
 num-bigint.workspace = true
 num-traits.workspace = true
-rustc-hash = "1.1.0"
+rustc-hash = "2.1.1"
 small-ord-set = "0.1.3"
 cfg-if.workspace = true
 tracing.workspace = true

tooling/lsp/Cargo.toml

@@ -15,7 +15,6 @@ workspace = true
 [dependencies]
 acvm.workspace = true
 codespan-lsp.workspace = true
-lsp-types.workspace = true
 nargo = { workspace = true, features = ["rpc"] }
 nargo_fmt.workspace = true
 nargo_toml.workspace = true

tooling/lsp/src/lib.rs

@@ -14,19 +14,19 @@ use std::{
 };
 
 use acvm::{BlackBoxFunctionSolver, FieldElement};
-use async_lsp::{
-    AnyEvent, AnyNotification, AnyRequest, ClientSocket, Error, LspService, ResponseError,
-    router::Router,
-};
-use fm::{FileManager, codespan_files as files};
-use fxhash::FxHashSet;
-use lsp_types::{
+use async_lsp::lsp_types::{
     CodeLens,
     request::{
         CodeActionRequest, Completion, DocumentSymbolRequest, HoverRequest, InlayHintRequest,
         PrepareRenameRequest, References, Rename, SignatureHelpRequest, WorkspaceSymbolRequest,
     },
 };
+use async_lsp::{
+    AnyEvent, AnyNotification, AnyRequest, ClientSocket, Error, LspService, ResponseError,
+    router::Router,
+};
+use fm::{FileManager, codespan_files as files};
+use fxhash::FxHashSet;
 use nargo::{
     package::{Package, PackageType},
     parse_all,

tooling/lsp/src/notifications/mod.rs

@@ -5,10 +5,11 @@ use std::path::PathBuf;
 use crate::{
     PackageCacheData, WorkspaceCacheData, insert_all_files_for_workspace_into_file_manager,
 };
+use async_lsp::lsp_types;
+use async_lsp::lsp_types::{DiagnosticRelatedInformation, DiagnosticTag, Url};
 use async_lsp::{ErrorCode, LanguageClient, ResponseError};
 use fm::{FileManager, FileMap};
 use fxhash::FxHashMap as HashMap;
-use lsp_types::{DiagnosticRelatedInformation, DiagnosticTag, Url};
 use noirc_driver::check_crate;
 use noirc_errors::reporter::CustomLabel;
 use noirc_errors::{CustomDiagnostic, DiagnosticKind, Location};
@@ -329,7 +330,7 @@ mod notification_tests {
     use crate::test_utils;
 
     use super::*;
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         InlayHintLabel, InlayHintParams, Position, Range, TextDocumentContentChangeEvent,
         TextDocumentIdentifier, TextDocumentItem, VersionedTextDocumentIdentifier,
         WorkDoneProgressParams,

tooling/lsp/src/requests/code_action.rs

@@ -5,11 +5,11 @@
 };
 
 use async_lsp::ResponseError;
-use fm::{FileId, FileMap, PathString};
-use lsp_types::{
+use async_lsp::lsp_types::{
     CodeAction, CodeActionKind, CodeActionOrCommand, CodeActionParams, CodeActionResponse,
     TextDocumentPositionParams, TextEdit, Url, WorkspaceEdit,
 };
+use fm::{FileId, FileMap, PathString};
 use noirc_errors::Span;
 use noirc_frontend::{
     ParsedModule,
@@ -185,7 +185,7 @@
 
         CodeAction {
             title,
             kind: Some(CodeActionKind::QUICKFIX),
             diagnostics: None,
             edit: Some(workspace_edit),
             command: None,

tooling/lsp/src/requests/code_action/fill_struct_fields.rs

@@ -1,4 +1,4 @@
-use lsp_types::TextEdit;
+use async_lsp::lsp_types::TextEdit;
 use noirc_errors::Span;
 use noirc_frontend::{
     ast::{ConstructorExpression, UnresolvedTypeData},

tooling/lsp/src/requests/code_action/implement_missing_members.rs

@@ -1,6 +1,6 @@
 use std::collections::HashMap;
 
-use lsp_types::TextEdit;
+use async_lsp::lsp_types::TextEdit;
 use noirc_errors::{Location, Span};
 use noirc_frontend::{
     Kind,

tooling/lsp/src/requests/code_action/import_or_qualify.rs

@@ -1,4 +1,4 @@
-use lsp_types::TextEdit;
+use async_lsp::lsp_types::TextEdit;
 use noirc_errors::Location;
 use noirc_frontend::ast::{Ident, Path};
 

tooling/lsp/src/requests/code_action/remove_bang_from_call.rs

@@ -1,4 +1,4 @@
-use lsp_types::TextEdit;
+use async_lsp::lsp_types::TextEdit;
 use noirc_errors::{Location, Span};
 use noirc_frontend::{QuotedType, Type, node_interner::ReferenceId};
 

tooling/lsp/src/requests/code_action/remove_unused_import.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
+use async_lsp::lsp_types::TextEdit;
 use fm::FileId;
-use lsp_types::TextEdit;
 use noirc_errors::{Location, Span};
 use noirc_frontend::{
     ParsedModule,

tooling/lsp/src/requests/code_action/tests.rs

@@ -5,7 +5,7 @@ use crate::{
     utils::get_cursor_line_and_column,
 };
 
-use lsp_types::{
+use async_lsp::lsp_types::{
     CodeActionContext, CodeActionOrCommand, CodeActionParams, CodeActionResponse,
     DidOpenTextDocumentParams, PartialResultParams, Position, Range, TextDocumentIdentifier,
     TextDocumentItem, WorkDoneProgressParams,

tooling/lsp/src/requests/completion.rs

@@ -5,14 +5,16 @@
 };
 
 use async_lsp::ResponseError;
+use async_lsp::lsp_types::{
+    CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse,
+};
 use completion_items::{
     field_completion_item, simple_completion_item, snippet_completion_item,
     trait_impl_method_completion_item,
 };
 use convert_case::{Case, Casing};
 use fm::{FileId, FileMap, PathString};
 use kinds::{FunctionCompletionKind, FunctionKind, RequestedItems};
-use lsp_types::{CompletionItem, CompletionItemKind, CompletionParams, CompletionResponse};
 use noirc_errors::{Location, Span};
 use noirc_frontend::{
     DataType, ParsedModule, Type, TypeBinding,
@@ -47,7 +49,7 @@
 use super::{TraitReexport, process_request};
 
 mod auto_import;
 mod builtins;
 mod completion_items;
 mod kinds;
 mod sort_text;
@@ -1952,8 +1954,8 @@
 ///
 /// For example:
 ///
 /// // "merk" and "ro" match "merkle" and "root" and are in order
 /// name_matches("compute_merkle_root", "merk_ro") == true
 ///
 /// // "ro" matches "root", but "merkle" comes before it, so no match
 /// name_matches("compute_merkle_root", "ro_mer") == false

tooling/lsp/src/requests/completion/builtins.rs

@@ -1,4 +1,4 @@
-use lsp_types::CompletionItemKind;
+use async_lsp::lsp_types::CompletionItemKind;
 use noirc_frontend::{ast::AttributeTarget, token::Keyword};
 use strum::IntoEnumIterator;
 

tooling/lsp/src/requests/completion/completion_items.rs

@@ -1,4 +1,4 @@
-use lsp_types::{
+use async_lsp::lsp_types::{
     Command, CompletionItem, CompletionItemKind, CompletionItemLabelDetails, Documentation,
     InsertTextFormat, MarkupContent, MarkupKind,
 };

tooling/lsp/src/requests/completion/tests.rs

@@ -19,7 +19,7 @@
         utils::get_cursor_line_and_column,
     };
 
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         CompletionItem, CompletionItemKind, CompletionItemLabelDetails, CompletionParams,
         CompletionResponse, DidOpenTextDocumentParams, Documentation, PartialResultParams,
         Position, TextDocumentIdentifier, TextDocumentItem, TextDocumentPositionParams,
@@ -126,14 +126,14 @@
     #[test]
     async fn test_use_first_segment() {
         let src = r#"
             mod foobaz {}
             mod foobar {}
             use foob>|<
         "#;
 
         assert_completion(
             src,
             vec![module_completion_item("foobaz"), module_completion_item("foobar")],
         )
         .await;
     }
@@ -296,7 +296,7 @@
             mod bar {
                 mod something {}
 
                 use super::foob>|<
             }
         "#;
 
@@ -1729,7 +1729,7 @@
     #[test]
     async fn test_auto_import_suggests_modules_too() {
         let src = r#"mod foo {
         pub mod barbaz {
             fn hello_world() {}
         }
     }
@@ -1739,7 +1739,7 @@
     }
 }"#;
 
         let expected = r#"use foo::barbaz;
 
 mod foo {
         pub mod barbaz {

tooling/lsp/src/requests/document_symbol.rs

@@ -1,11 +1,11 @@
 use std::future::{self, Future};
 
 use async_lsp::ResponseError;
-use fm::{FileId, FileMap, PathString};
-use lsp_types::{
+use async_lsp::lsp_types::{
     DocumentSymbol, DocumentSymbolParams, DocumentSymbolResponse, Location, Position, SymbolKind,
     TextDocumentPositionParams,
 };
+use fm::{FileId, FileMap, PathString};
 use noirc_errors::Span;
 use noirc_frontend::{
     ParsedModule,
@@ -520,7 +520,7 @@ mod document_symbol_tests {
     use crate::test_utils;
 
     use super::*;
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         PartialResultParams, Range, SymbolKind, TextDocumentIdentifier, WorkDoneProgressParams,
     };
     use tokio::test;

tooling/lsp/src/requests/goto_declaration.rs

@@ -4,7 +4,7 @@ use crate::LspState;
 use crate::types::GotoDeclarationResult;
 use async_lsp::ResponseError;
 
-use lsp_types::request::{GotoDeclarationParams, GotoDeclarationResponse};
+use async_lsp::lsp_types::request::{GotoDeclarationParams, GotoDeclarationResponse};
 
 use super::{process_request, to_lsp_location};
 

tooling/lsp/src/requests/goto_definition.rs

@@ -5,6 +5,7 @@ use crate::utils;
 use crate::{LspState, types::GotoDefinitionResult};
 use async_lsp::ResponseError;
 
+use async_lsp::lsp_types;
 use fm::PathString;
 use lsp_types::request::GotoTypeDefinitionParams;
 use lsp_types::{GotoDefinitionParams, GotoDefinitionResponse};
@@ -76,7 +77,7 @@ mod goto_definition_tests {
     use std::panic;
 
     use crate::test_utils::{self, search_in_file};
-    use lsp_types::{Position, Range};
+    use async_lsp::lsp_types::{Position, Range};
     use tokio::test;
 
     use super::*;

tooling/lsp/src/requests/hover.rs

@@ -1,10 +1,10 @@
 use std::future::{self, Future};
 
 use async_lsp::ResponseError;
+use async_lsp::lsp_types::{Hover, HoverParams};
 use fm::PathString;
 use from_reference::hover_from_reference;
 use from_visitor::hover_from_visitor;
-use lsp_types::{Hover, HoverParams};
 
 use crate::LspState;
 
@@ -34,7 +34,7 @@ mod hover_tests {
     use crate::test_utils;
 
     use super::*;
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         HoverContents, Position, TextDocumentIdentifier, TextDocumentPositionParams, Url,
         WorkDoneProgressParams,
     };

tooling/lsp/src/requests/hover/from_reference.rs

@@ -1,5 +1,6 @@
+use async_lsp::lsp_types;
+use async_lsp::lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, Position};
 use fm::{FileId, FileMap};
-use lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, Position};
 use noirc_frontend::hir::comptime::Value;
 use noirc_frontend::node_interner::GlobalValue;
 use noirc_frontend::shared::Visibility;

tooling/lsp/src/requests/hover/from_visitor.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 
+use async_lsp::lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, Position};
 use fm::{FileId, FileMap};
-use lsp_types::{Hover, HoverContents, MarkupContent, MarkupKind, Position};
 use noirc_errors::{Location, Span};
 use noirc_frontend::{
     Type, ast::Visitor, node_interner::NodeInterner, parse_program, signed_field::SignedField,

tooling/lsp/src/requests/inlay_hint.rs

@@ -1,11 +1,12 @@
 use std::future::{self, Future};
 
 use async_lsp::ResponseError;
-use fm::{FileId, FileMap, PathString};
-use lsp_types::{
+use async_lsp::lsp_types;
+use async_lsp::lsp_types::{
     InlayHint, InlayHintKind, InlayHintLabel, InlayHintLabelPart, InlayHintParams, Position, Range,
     TextDocumentPositionParams, TextEdit,
 };
+use fm::{FileId, FileMap, PathString};
 use noirc_errors::{Location, Span};
 use noirc_frontend::{
     self, Kind, Type, TypeBinding, TypeVariable,
@@ -608,7 +609,7 @@ mod inlay_hints_tests {
     };
 
     use super::*;
-    use lsp_types::{Range, TextDocumentIdentifier, WorkDoneProgressParams};
+    use async_lsp::lsp_types::{Range, TextDocumentIdentifier, WorkDoneProgressParams};
     use tokio::test;
 
     async fn get_inlay_hints(

tooling/lsp/src/requests/mod.rs

@@ -25,6 +25,8 @@ use noirc_frontend::usage_tracker::UsageTracker;
 use noirc_frontend::{graph::Dependency, node_interner::NodeInterner};
 use serde::{Deserialize, Serialize};
 
+use async_lsp::lsp_types;
+
 use crate::{
     LspState,
     types::{InitializeResult, NargoCapability, NargoTestsOptions, ServerCapabilities},
@@ -192,6 +194,7 @@ impl Default for LspInitializationOptions {
     }
 }
 
+#[expect(deprecated)]
 pub(crate) fn on_initialize(
     state: &mut LspState,
     params: InitializeParams,
@@ -710,7 +713,7 @@ pub(crate) struct TraitReexport {
 mod initialization {
     use acvm::blackbox_solver::StubbedBlackBoxSolver;
     use async_lsp::ClientSocket;
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         CodeLensOptions, InitializeParams, TextDocumentSyncCapability, TextDocumentSyncKind,
     };
     use tokio::test;

tooling/lsp/src/requests/references.rs

@@ -1,7 +1,7 @@
 use std::future::{self, Future};
 
 use async_lsp::ResponseError;
-use lsp_types::{Location, ReferenceParams};
+use async_lsp::lsp_types::{Location, ReferenceParams};
 
 use crate::LspState;
 
@@ -31,7 +31,7 @@ mod references_tests {
     use crate::test_utils::{self, search_in_file};
     use crate::utils::get_cursor_line_and_column;
     use crate::{notifications, on_did_open_text_document};
-    use lsp_types::{
+    use async_lsp::lsp_types::{
         DidOpenTextDocumentParams, PartialResultParams, Position, Range, ReferenceContext,
         TextDocumentIdentifier, TextDocumentItem, TextDocumentPositionParams, Url,
         WorkDoneProgressParams,

tooling/lsp/src/requests/rename.rs

@@ -4,6 +4,7 @@ use std::{
 };
 
 use async_lsp::ResponseError;
+use async_lsp::lsp_types;
 use lsp_types::{
     PrepareRenameResponse, RenameParams, TextDocumentPositionParams, TextEdit, Url, WorkspaceEdit,
 };
@@ -71,7 +72,7 @@ pub(crate) fn on_rename_request(
 mod rename_tests {
     use super::*;
     use crate::test_utils::{self, search_in_file};
-    use lsp_types::{Range, WorkDoneProgressParams};
+    use async_lsp::lsp_types::{Range, WorkDoneProgressParams};
     use tokio::test;
 
     async fn check_rename_succeeds(directory: &str, name: &str) {