Skip to content

Commit 8a7ac24

Browse files
committed
Auto merge of #155339 - JonathanBrouwer:rollup-2nyGW0a, r=JonathanBrouwer
Rollup of 5 pull requests Successful merges: - rust-lang/rust#155331 (Reformat `top_level_options!` and `options!` macro declarations) - rust-lang/rust#155332 (bump std libc to `0.2.185`) - rust-lang/rust#155286 (attribute cleanup: rustc_confusables) - rust-lang/rust#155306 (`CValue::zst()` - add missing "ZST" in docs) - rust-lang/rust#155311 (various small `rustc_expand` cleanups)
2 parents c980e51 + 53df1dd commit 8a7ac24

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)