Skip to content

Commit 707c5c4

Browse files
committed
Auto merge of #96520 - lcnr:general-incoherent-impls, r=petrochenkov
generalize "incoherent impls" impl for user defined types To allow the move of `trait Error` into core. continues the work from #94963, finishes rust-lang/compiler-team#487 r? `@petrochenkov` cc `@yaahc`
2 parents f560152 + c8e4878 commit 707c5c4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

core/src/ffi/c_str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ use crate::str;
7777
#[derive(Hash)]
7878
#[cfg_attr(not(test), rustc_diagnostic_item = "CStr")]
7979
#[unstable(feature = "core_c_str", issue = "94079")]
80-
#[cfg_attr(not(bootstrap), lang = "CStr")]
80+
#[cfg_attr(not(bootstrap), rustc_has_incoherent_inherent_impls)]
8181
// FIXME:
8282
// `fn from` in `impl From<&CStr> for Box<CStr>` current implementation relies
8383
// on `CStr` being layout-compatible with `[u8]`.

0 commit comments

Comments
 (0)