rust-analyzer

diff --git a/crates/proc-macro-srv-cli/src/main.rs b/crates/proc-macro-srv-cli/src/main.rs
index 174f9c5246..7095dac348 100644
--- a/crates/proc-macro-srv-cli/src/main.rs
+++ b/crates/proc-macro-srv-cli/src/main.rs

@@ -69,7 +69,7 @@ fn run() -> io::Result<()> {

let write_response = |msg: msg::Response| msg.write(write_json, &mut io::stdout().lock());

- let env = EnvSnapshot::new();

+ let env = EnvSnapshot::default();

let mut srv = proc_macro_srv::ProcMacroSrv::new(&env);

let mut buf = String::new();

diff --git a/crates/proc-macro-srv/src/lib.rs b/crates/proc-macro-srv/src/lib.rs
index 8e78e6f2e0..85833dab1b 100644
--- a/crates/proc-macro-srv/src/lib.rs
+++ b/crates/proc-macro-srv/src/lib.rs

@@ -13,7 +13,7 @@

#![cfg(any(feature = "sysroot-abi", rust_analyzer))]

#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]

#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]

-#![allow(unreachable_pub, internal_features)]

+#![allow(unreachable_pub, internal_features, clippy::disallowed_types, clippy::print_stderr)]

extern crate proc_macro;

#[cfg(feature = "in-rust-tree")]

@@ -65,7 +65,7 @@ impl<'env> ProcMacroSrv<'env> {

const EXPANDER_STACK_SIZE: usize = 8 * 1024 * 1024;

-impl<'env> ProcMacroSrv<'env> {

+impl ProcMacroSrv<'_> {

pub fn set_span_mode(&mut self, span_mode: SpanMode) {

self.span_mode = span_mode;

}

@@ -248,8 +248,8 @@ pub struct EnvSnapshot {

vars: HashMap<OsString, OsString>,

}

-impl EnvSnapshot {

- pub fn new() -> EnvSnapshot {

+impl Default for EnvSnapshot {

+ fn default() -> EnvSnapshot {

EnvSnapshot { vars: env::vars_os().collect() }

}

@@ -305,7 +305,7 @@ impl Drop for EnvChange<'_> {

}

if let Some(dir) = &self.prev_working_dir {

- if let Err(err) = std::env::set_current_dir(&dir) {

+ if let Err(err) = std::env::set_current_dir(dir) {

eprintln!(

"Failed to set the current working dir to {}. Error: {:?}",

dir.display(),

diff --git a/crates/proc-macro-srv/src/proc_macros.rs b/crates/proc-macro-srv/src/proc_macros.rs
index d48c5b30de..097b39a3f9 100644
--- a/crates/proc-macro-srv/src/proc_macros.rs
+++ b/crates/proc-macro-srv/src/proc_macros.rs

@@ -13,7 +13,7 @@ pub(crate) struct ProcMacros {

impl From<bridge::PanicMessage> for crate::PanicMessage {

fn from(p: bridge::PanicMessage) -> Self {

- Self { message: p.as_str().map(|s| s.to_string()) }

+ Self { message: p.as_str().map(|s| s.to_owned()) }

}

diff --git a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
index d508c19dd7..1b535d2a1c 100644
--- a/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs
+++ b/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs

@@ -498,7 +498,7 @@ mod tests {

})),

tt::TokenTree::Leaf(tt::Leaf::Ident(tt::Ident {

sym: Symbol::intern("T"),

- span: span,

+ span,

is_raw: tt::IdentIsRaw::No,

})),

tt::TokenTree::Subtree(tt::Subtree {

diff --git a/crates/proc-macro-srv/src/server_impl/token_stream.rs b/crates/proc-macro-srv/src/server_impl/token_stream.rs
index dbcb5a3143..5649e60e0b 100644
--- a/crates/proc-macro-srv/src/server_impl/token_stream.rs
+++ b/crates/proc-macro-srv/src/server_impl/token_stream.rs

@@ -99,7 +99,7 @@ pub(super) struct TokenStreamBuilder<S> {

}

/// pub(super)lic implementation details for the `TokenStream` type, such as iterators.

-pub(super) mod token_stream {

+pub(super) mod token_stream_impls {

use core::fmt;

@@ -137,6 +137,7 @@ pub(super) mod token_stream {

}

+ #[allow(clippy::to_string_trait_impl)]

impl<S> ToString for TokenStream<S> {

fn to_string(&self) -> String {

::tt::pretty(&self.token_trees)

@@ -150,7 +151,7 @@ impl<S> TokenStreamBuilder<S> {

}

pub(super) fn push(&mut self, stream: TokenStream<S>) {

- self.acc.extend(stream.into_iter())

+ self.acc.extend(stream)

}

pub(super) fn build(self) -> TokenStream<S> {

diff --git a/crates/proc-macro-srv/src/tests/utils.rs b/crates/proc-macro-srv/src/tests/utils.rs
index 4f1a18c03f..cc5d4a8913 100644
--- a/crates/proc-macro-srv/src/tests/utils.rs
+++ b/crates/proc-macro-srv/src/tests/utils.rs

@@ -97,7 +97,7 @@ fn assert_expand_impl(

pub(crate) fn list() -> Vec<String> {

let dylib_path = proc_macro_test_dylib_path();

- let env = EnvSnapshot::new();

+ let env = EnvSnapshot::default();

let mut srv = ProcMacroSrv::new(&env);

let res = srv.list_macros(&dylib_path).unwrap();

res.into_iter().map(|(name, kind)| format!("{name} [{kind:?}]")).collect()