Switch to Rust 2024 edition (#18129)

crates/ty_server/src/document/location.rs

@@ -1,6 +1,6 @@
+use crate::PositionEncoding;
 use crate::document::{FileRangeExt, ToRangeExt};
 use crate::system::file_to_url;
-use crate::PositionEncoding;
 use lsp_types::Location;
 use ruff_db::files::FileRange;
 use ruff_db::source::{line_index, source_text};

crates/ty_server/src/document/range.rs

@@ -1,5 +1,5 @@
-use super::notebook;
 use super::PositionEncoding;
+use super::notebook;
 use crate::system::file_to_url;
 
 use lsp_types as types;
@@ -21,7 +21,7 @@ pub(crate) struct NotebookRange {
 
 pub(crate) trait RangeExt {
     fn to_text_range(&self, text: &str, index: &LineIndex, encoding: PositionEncoding)
-        -> TextRange;
+    -> TextRange;
 }
 
 pub(crate) trait PositionExt {

crates/ty_server/src/document/text_document.rs

@@ -82,9 +82,11 @@ impl TextDocument {
         new_version: DocumentVersion,
         encoding: PositionEncoding,
     ) {
-        if let [lsp_types::TextDocumentContentChangeEvent {
-            range: None, text, ..
-        }] = changes.as_slice()
+        if let [
+            lsp_types::TextDocumentContentChangeEvent {
+                range: None, text, ..
+            },
+        ] = changes.as_slice()
         {
             tracing::debug!("Fast path - replacing entire document");
             self.modify(|contents, version| {

crates/ty_server/src/logging.rs

@@ -9,9 +9,9 @@ use serde::Deserialize;
 use std::{path::PathBuf, str::FromStr, sync::Arc};
 use tracing::level_filters::LevelFilter;
 use tracing_subscriber::{
+    Layer,
     fmt::{time::Uptime, writer::BoxMakeWriter},
     layer::SubscriberExt,
-    Layer,
 };
 
 pub(crate) fn init_logging(log_level: LogLevel, log_file: Option<&std::path::Path>) {

crates/ty_server/src/server.rs

@@ -16,8 +16,8 @@ use lsp_types::{
 
 use self::connection::{Connection, ConnectionInitializer};
 use self::schedule::event_loop_thread;
-use crate::session::{AllSettings, ClientSettings, Experimental, Session};
 use crate::PositionEncoding;
+use crate::session::{AllSettings, ClientSettings, Experimental, Session};
 
 mod api;
 mod client;
@@ -240,7 +240,9 @@ impl Server {
                 },
                 response_handler,
             ) {
-                tracing::error!("An error occurred when trying to register the configuration file watcher: {err}");
+                tracing::error!(
+                    "An error occurred when trying to register the configuration file watcher: {err}"
+                );
             }
         } else {
             tracing::warn!("The client does not support file system watching.");

crates/ty_server/src/server/api.rs

@@ -1,6 +1,6 @@
 use crate::server::schedule::Task;
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 use lsp_server as server;
 use lsp_types::notification::Notification;
 
@@ -14,7 +14,7 @@ use requests as request;
 
 use self::traits::{NotificationHandler, RequestHandler};
 
-use super::{client::Responder, schedule::BackgroundSchedule, Result};
+use super::{Result, client::Responder, schedule::BackgroundSchedule};
 
 pub(super) fn request<'a>(req: server::Request) -> Task<'a> {
     let id = req.id.clone();

crates/ty_server/src/server/api/diagnostics.rs

@@ -1,8 +1,8 @@
 use lsp_server::ErrorCode;
-use lsp_types::{notification::PublishDiagnostics, PublishDiagnosticsParams, Url};
+use lsp_types::{PublishDiagnosticsParams, Url, notification::PublishDiagnostics};
 
-use crate::server::client::Notifier;
 use crate::server::Result;
+use crate::server::client::Notifier;
 
 use super::LSPResult;
 

crates/ty_server/src/server/api/notifications/did_change.rs

@@ -1,15 +1,15 @@
 use lsp_server::ErrorCode;
-use lsp_types::notification::DidChangeTextDocument;
 use lsp_types::DidChangeTextDocumentParams;
+use lsp_types::notification::DidChangeTextDocument;
 
 use ty_project::watch::ChangeEvent;
 
-use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::api::LSPResult;
-use crate::server::client::{Notifier, Requester};
 use crate::server::Result;
+use crate::server::api::LSPResult;
+use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
+use crate::server::client::{Notifier, Requester};
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 
 pub(crate) struct DidChangeTextDocumentHandler;
 

crates/ty_server/src/server/api/notifications/did_change_watched_files.rs

@@ -1,15 +1,15 @@
-use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
+use crate::server::Result;
 use crate::server::api::LSPResult;
+use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
 use crate::server::client::{Notifier, Requester};
 use crate::server::schedule::Task;
-use crate::server::Result;
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 use lsp_types as types;
-use lsp_types::{notification as notif, FileChangeType};
+use lsp_types::{FileChangeType, notification as notif};
 use rustc_hash::FxHashMap;
-use ty_project::watch::{ChangeEvent, ChangedKind, CreatedKind, DeletedKind};
 use ty_project::Db;
+use ty_project::watch::{ChangeEvent, ChangedKind, CreatedKind, DeletedKind};
 
 pub(crate) struct DidChangeWatchedFiles;
 

crates/ty_server/src/server/api/notifications/did_close.rs

@@ -1,15 +1,15 @@
 use lsp_server::ErrorCode;
-use lsp_types::notification::DidCloseTextDocument;
 use lsp_types::DidCloseTextDocumentParams;
+use lsp_types::notification::DidCloseTextDocument;
 use ty_project::watch::ChangeEvent;
 
+use crate::server::Result;
+use crate::server::api::LSPResult;
 use crate::server::api::diagnostics::clear_diagnostics;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::api::LSPResult;
 use crate::server::client::{Notifier, Requester};
-use crate::server::Result;
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 
 pub(crate) struct DidCloseTextDocumentHandler;
 

crates/ty_server/src/server/api/notifications/did_close_notebook.rs

@@ -1,14 +1,14 @@
-use lsp_types::notification::DidCloseNotebookDocument;
 use lsp_types::DidCloseNotebookDocumentParams;
+use lsp_types::notification::DidCloseNotebookDocument;
 
 use ty_project::watch::ChangeEvent;
 
-use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::api::LSPResult;
-use crate::server::client::{Notifier, Requester};
 use crate::server::Result;
+use crate::server::api::LSPResult;
+use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
+use crate::server::client::{Notifier, Requester};
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 
 pub(crate) struct DidCloseNotebookHandler;
 

crates/ty_server/src/server/api/notifications/did_open.rs

@@ -4,12 +4,12 @@ use lsp_types::{DidOpenTextDocumentParams, TextDocumentItem};
 use ruff_db::Db;
 use ty_project::watch::ChangeEvent;
 
+use crate::TextDocument;
+use crate::server::Result;
 use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
 use crate::server::client::{Notifier, Requester};
-use crate::server::Result;
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
-use crate::TextDocument;
+use crate::system::{AnySystemPath, url_to_any_system_path};
 
 pub(crate) struct DidOpenTextDocumentHandler;
 

crates/ty_server/src/server/api/notifications/did_open_notebook.rs

@@ -1,17 +1,17 @@
 use lsp_server::ErrorCode;
-use lsp_types::notification::DidOpenNotebookDocument;
 use lsp_types::DidOpenNotebookDocumentParams;
+use lsp_types::notification::DidOpenNotebookDocument;
 
 use ruff_db::Db;
 use ty_project::watch::ChangeEvent;
 
 use crate::document::NotebookDocument;
-use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
-use crate::server::api::LSPResult;
-use crate::server::client::{Notifier, Requester};
 use crate::server::Result;
+use crate::server::api::LSPResult;
+use crate::server::api::traits::{NotificationHandler, SyncNotificationHandler};
+use crate::server::client::{Notifier, Requester};
 use crate::session::Session;
-use crate::system::{url_to_any_system_path, AnySystemPath};
+use crate::system::{AnySystemPath, url_to_any_system_path};
 
 pub(crate) struct DidOpenNotebookHandler;
 

crates/ty_server/src/server/api/requests/completion.rs

@@ -6,10 +6,10 @@ use ruff_db::source::{line_index, source_text};
 use ty_ide::completion;
 use ty_project::ProjectDatabase;
 
+use crate::DocumentSnapshot;
 use crate::document::PositionExt;
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
 use crate::server::client::Notifier;
-use crate::DocumentSnapshot;
 
 pub(crate) struct CompletionRequestHandler;
 

crates/ty_server/src/server/api/requests/diagnostic.rs

@@ -9,7 +9,7 @@ use lsp_types::{
 
 use crate::document::ToRangeExt;
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
-use crate::server::{client::Notifier, Result};
+use crate::server::{Result, client::Notifier};
 use crate::session::DocumentSnapshot;
 use ruff_db::diagnostic::Severity;
 use ruff_db::source::{line_index, source_text};

crates/ty_server/src/server/api/requests/goto_type_definition.rs

@@ -6,10 +6,10 @@ use ruff_db::source::{line_index, source_text};
 use ty_ide::goto_type_definition;
 use ty_project::ProjectDatabase;
 
+use crate::DocumentSnapshot;
 use crate::document::{PositionExt, ToLink};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
 use crate::server::client::Notifier;
-use crate::DocumentSnapshot;
 
 pub(crate) struct GotoTypeDefinitionRequestHandler;
 

crates/ty_server/src/server/api/requests/hover.rs

@@ -1,14 +1,14 @@
 use std::borrow::Cow;
 
+use crate::DocumentSnapshot;
 use crate::document::{PositionExt, ToRangeExt};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
 use crate::server::client::Notifier;
-use crate::DocumentSnapshot;
 use lsp_types::request::HoverRequest;
 use lsp_types::{HoverContents, HoverParams, MarkupContent, Url};
 use ruff_db::source::{line_index, source_text};
 use ruff_text_size::Ranged;
-use ty_ide::{hover, MarkupKind};
+use ty_ide::{MarkupKind, hover};
 use ty_project::ProjectDatabase;
 
 pub(crate) struct HoverRequestHandler;

crates/ty_server/src/server/api/requests/inlay_hints.rs

@@ -1,9 +1,9 @@
 use std::borrow::Cow;
 
+use crate::DocumentSnapshot;
 use crate::document::{RangeExt, TextSizeExt};
 use crate::server::api::traits::{BackgroundDocumentRequestHandler, RequestHandler};
 use crate::server::client::Notifier;
-use crate::DocumentSnapshot;
 use lsp_types::request::InlayHintRequest;
 use lsp_types::{InlayHintParams, Url};
 use ruff_db::source::{line_index, source_text};

crates/ty_server/src/server/client.rs

@@ -4,7 +4,7 @@ use lsp_server::{Notification, RequestId};
 use rustc_hash::FxHashMap;
 use serde_json::Value;
 
-use super::{schedule::Task, ClientSender};
+use super::{ClientSender, schedule::Task};
 
 type ResponseBuilder<'s> = Box<dyn FnOnce(lsp_server::Response) -> Task<'s>>;
 

crates/ty_server/src/server/connection.rs

@@ -124,7 +124,9 @@ impl Connection {
             lsp::Message::Notification(lsp::Notification { method, .. })
                 if method == lsp_types::notification::Exit::METHOD =>
             {
-                anyhow::bail!("Server received an exit notification before a shutdown request was sent. Exiting...");
+                anyhow::bail!(
+                    "Server received an exit notification before a shutdown request was sent. Exiting..."
+                );
             }
             _ => Ok(false),
         }

crates/ty_server/src/server/schedule.rs

@@ -12,7 +12,7 @@ use self::{
     thread::ThreadPriority,
 };
 
-use super::{client::Client, ClientSender};
+use super::{ClientSender, client::Client};
 
 /// The event loop thread is actually a secondary thread that we spawn from the
 /// _actual_ main thread. This secondary thread has a larger stack size

crates/ty_server/src/server/schedule/thread/pool.rs

@@ -16,8 +16,8 @@
 use std::{
     num::NonZeroUsize,
     sync::{
-        atomic::{AtomicUsize, Ordering},
         Arc,
+        atomic::{AtomicUsize, Ordering},
     },
 };
 

crates/ty_server/src/session.rs

@@ -8,13 +8,13 @@ use std::sync::Arc;
 use anyhow::anyhow;
 use lsp_types::{ClientCapabilities, TextDocumentContentChangeEvent, Url};
 
-use ruff_db::files::{system_path_to_file, File};
-use ruff_db::system::SystemPath;
 use ruff_db::Db;
+use ruff_db::files::{File, system_path_to_file};
+use ruff_db::system::SystemPath;
 use ty_project::{ProjectDatabase, ProjectMetadata};
 
 use crate::document::{DocumentKey, DocumentVersion, NotebookDocument};
-use crate::system::{url_to_any_system_path, AnySystemPath, LSPSystem};
+use crate::system::{AnySystemPath, LSPSystem, url_to_any_system_path};
 use crate::{PositionEncoding, TextDocument};
 
 pub(crate) use self::capabilities::ResolvedClientCapabilities;

crates/ty_server/src/session/index.rs

@@ -5,8 +5,8 @@ use lsp_types::Url;
 use rustc_hash::FxHashMap;
 
 use crate::{
-    document::{DocumentKey, DocumentVersion, NotebookDocument},
     PositionEncoding, TextDocument,
+    document::{DocumentKey, DocumentVersion, NotebookDocument},
 };
 
 use super::ClientSettings;

crates/ty_server/src/system.rs

@@ -13,8 +13,8 @@ use ruff_db::system::{
 use ruff_notebook::{Notebook, NotebookError};
 use ty_python_semantic::Db;
 
-use crate::session::index::Index;
 use crate::DocumentQuery;
+use crate::session::index::Index;
 
 /// Converts the given [`Url`] to an [`AnySystemPath`].
 ///
@@ -221,7 +221,7 @@ impl System for LSPSystem {
         &self,
         pattern: &str,
     ) -> std::result::Result<
-        Box<dyn Iterator<Item = std::result::Result<SystemPathBuf, GlobError>>>,
+        Box<dyn Iterator<Item = std::result::Result<SystemPathBuf, GlobError>> + '_>,
         PatternError,
     > {
         self.os_system.glob(pattern)