Unnamed repository; edit this file 'description' to name the repository.
Merge ref 'e8e4541ff196' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh.
Upstream ref: rust-lang/rust@e8e4541ff19649d95afab52fdde2c2eaa6829965
Filtered ref: rust-lang/rust-analyzer@77fb39b687552733ccfa331e02a05b356679086a
Upstream diff: https://github.com/rust-lang/rust/compare/4c4205163abcbd08948b3efab796c543ba1ea687...e8e4541ff19649d95afab52fdde2c2eaa6829965
This merge was created using https://github.com/rust-lang/josh-sync.
| -rw-r--r-- | crates/proc-macro-srv/src/dylib/proc_macros.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/proc-macro-srv/src/dylib/proc_macros.rs b/crates/proc-macro-srv/src/dylib/proc_macros.rs index 4065dbd0b4..cf00be0327 100644 --- a/crates/proc-macro-srv/src/dylib/proc_macros.rs +++ b/crates/proc-macro-srv/src/dylib/proc_macros.rs @@ -7,7 +7,7 @@ pub(crate) struct ProcMacros([bridge::client::ProcMacro]); impl From<bridge::PanicMessage> for crate::PanicMessage { fn from(p: bridge::PanicMessage) -> Self { - Self { message: p.as_str().map(|s| s.to_owned()) } + Self { message: p.into_string() } } } |