Skip to content

Commit 20149e5

Browse files
author
The rustc-josh-sync Cronjob Bot
committed
Merge ref 'e8e4541ff196' from rust-lang/rust
Pull recent changes from https://github.com/rust-lang/rust via Josh. Upstream ref: rust-lang/rust@e8e4541 Filtered ref: 77fb39b Upstream diff: rust-lang/rust@4c42051...e8e4541 This merge was created using https://github.com/rust-lang/josh-sync.
2 parents 9099af2 + 77fb39b commit 20149e5

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

crates/proc-macro-srv/src/dylib/proc_macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub(crate) struct ProcMacros([bridge::client::ProcMacro]);
77

88
impl From<bridge::PanicMessage> for crate::PanicMessage {
99
fn from(p: bridge::PanicMessage) -> Self {
10-
Self { message: p.as_str().map(|s| s.to_owned()) }
10+
Self { message: p.into_string() }
1111
}
1212
}
1313

0 commit comments

Comments
 (0)