Skip to content

Commit 314450f

Browse files
committed
Auto merge of #122111 - matthiaskrgr:rollup-qq4v6gs, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #113518 (bootstrap/libtest: print test name eagerly on failure even with `verbose-tests=false` / `--quiet`) - #117199 (Change the documented implicit value of `-C instrument-coverage` to `=yes`) - #121190 (avoid overlapping privacy suggestion for single nested imports) - #121382 (Rework `untranslatable_diagnostic` lint) - #121959 (Removing absolute path in proc-macro) - #122038 (Fix linting paths with qself in `unused_qualifications`) - #122051 (cleanup: remove zero-offset GEP) r? `@ghost` `@rustbot` modify labels: rollup
2 parents adae314 + d81e911 commit 314450f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

crates/hir-ty/src/layout.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//! Compute the binary representation of a type
22
3+
use std::borrow::Cow;
34
use std::fmt;
45

56
use base_db::salsa::Cycle;
@@ -114,8 +115,8 @@ struct LayoutCx<'a> {
114115
impl<'a> LayoutCalculator for LayoutCx<'a> {
115116
type TargetDataLayoutRef = &'a TargetDataLayout;
116117

117-
fn delayed_bug(&self, txt: String) {
118-
never!("{}", txt);
118+
fn delayed_bug(&self, txt: impl Into<Cow<'static, str>>) {
119+
never!("{}", txt.into());
119120
}
120121

121122
fn current_data_layout(&self) -> &'a TargetDataLayout {

0 commit comments

Comments
 (0)