Merge pull request #22060 from rust-lang/rustc-pull

lnicola · web-flow · commit 6c2b4eb9a08a · 2026-04-19T05:18:07.000Z
Rustc pull update
diff --git 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
@@ -1 +1 @@
-4c4205163abcbd08948b3efab796c543ba1ea687
+e8e4541ff19649d95afab52fdde2c2eaa6829965

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ pub(crate) struct ProcMacros([bridge::client::ProcMacro]);`
`7`	`7`
`8`	`8`	`impl From<bridge::PanicMessage> for crate::PanicMessage {`
`9`	`9`	`fn from(p: bridge::PanicMessage) -> Self {`
`10`		`- Self { message: p.as_str().map(\|s\| s.to_owned()) }`
	`10`	`+ Self { message: p.into_string() }`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`