Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Prepare for Rust edition bump to 2024 (without autofix) (#27791)

Browse source 
Successor to #27779 - in this PR I've applied changes manually, without
futzing with if let lifetimes at all.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2025-03-31 20:10:36 +02:00 • committed by GitHub
parent d51aa2ffb0
commit 0729d24d77
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
162 changed files with 2333 additions and 1937 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/lsp/src/lsp.rs
View file

@ -11,7 +11,7 @@ use notification::DidChangeWorkspaceFolders;
use parking_lot::{Mutex, RwLock};
use postage::{barrier, prelude::Stream};
use schemars::{
gen::SchemaGenerator,
r#gen::SchemaGenerator,
schema::{InstanceType, Schema, SchemaObject},
JsonSchema,
};
@ -830,7 +830,7 @@ impl LanguageServer {
}
/// Sends a shutdown request to the language server process and prepares the [`LanguageServer`] to be dropped.
pub fn shutdown(&self) -> Option<impl 'static + Send + Future<Output = Option<()>>> {
pub fn shutdown(&self) -> Option<impl 'static + Send + Future<Output = Option<()>> + use<>> {
if let Some(tasks) = self.io_tasks.lock().take() {
let response_handlers = self.response_handlers.clone();
let next_id = AtomicI32::new(self.next_id.load(SeqCst));
@ -1077,7 +1077,7 @@ impl LanguageServer {
pub fn request<T: request::Request>(
&self,
params: T::Params,
) -> impl LspRequestFuture<Result<T::Result>>
) -> impl LspRequestFuture<Result<T::Result>> + use<T>
where
T::Result: 'static + Send,
{
@ -1096,7 +1096,7 @@ impl LanguageServer {
outbound_tx: &channel::Sender<String>,
executor: &BackgroundExecutor,
params: T::Params,
) -> impl LspRequestFuture<Result<T::Result>>
) -> impl LspRequestFuture<Result<T::Result>> + use<T>
where
T::Result: 'static + Send,
{