Skip to content

Commit 804d68e

Browse files
authored
Rollup merge of rust-lang#143329 - folkertdev:minicore-diagnostic-on-unimplemented, r=jieyouxu
minicore: use core's `diagnostic::on_unimplemented` messages Without these attributes, the error message is different. Keeping the diagnostics up-to-date seems related to rust-lang#137531. The modified test files are reported in rust-lang#143319 as failing for `--target=riscv64gc-unknown-linux-gnu`. Using `minicore` for them makes it easier to troubleshoot this sort of issue. r? ``@jieyouxu``
2 parents fa70f6b + 3dbf315 commit 804d68e

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

core/src/marker.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ use crate::fmt::Debug;
1919
use crate::hash::{Hash, Hasher};
2020
use crate::pin::UnsafePinned;
2121

22+
// NOTE: for consistent error messages between `core` and `minicore`, all `diagnostic` attributes
23+
// should be replicated exactly in `minicore` (if `minicore` defines the item).
24+
2225
/// Implements a given marker trait for multiple types at the same time.
2326
///
2427
/// The basic syntax looks like this:

0 commit comments

Comments
 (0)