Unnamed repository; edit this file 'description' to name the repository.
Merge pull request #22060 from rust-lang/rustc-pull
Rustc pull update
| -rw-r--r-- | crates/proc-macro-srv/src/dylib/proc_macros.rs | 2 | ||||
| -rw-r--r-- | rust-version | 2 |
2 files changed, 2 insertions, 2 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() } } } diff --git a/rust-version b/rust-version index 38f153f78d..8d1ee32630 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -4c4205163abcbd08948b3efab796c543ba1ea687 +e8e4541ff19649d95afab52fdde2c2eaa6829965 |