about summary refs log tree commit diff
path: root/library
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-09-20 14:41:23 +0000
committerbors <bors@rust-lang.org>2024-09-20 14:41:23 +0000
commitfb46739014564a3c709c43e1429a6a5d71c97e26 (patch)
tree08a14b76185bff53274105f0c4d611de933c485e /library
parent1a5a2240bc1b8cf0bcce7acb946c78d6493a4fd3 (diff)
parentb2bcdbc79796655f8158460ff65deb919ef3a854 (diff)
downloadrust-fb46739014564a3c709c43e1429a6a5d71c97e26.tar.gz
rust-fb46739014564a3c709c43e1429a6a5d71c97e26.zip
Auto merge of #130615 - GuillaumeGomez:rollup-tq0ff7y, r=GuillaumeGomez
Rollup of 6 pull requests

Successful merges:

 - #129542 (Add regression test for #129541)
 - #129755 (test: cross-edition metavar fragment specifiers)
 - #130566 (Break up compiletest `runtest.rs` into smaller helper modules)
 - #130585 (Add tidy check for rustdoc templates to ensure the whitespace characters are all stripped)
 - #130605 (Fix feature name in test)
 - #130607 ([Clippy] Remove final std paths for diagnostic item)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library')
-rw-r--r--library/std/src/io/mod.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/io/mod.rs b/library/std/src/io/mod.rs
index 644b294db8d..2a4262b2367 100644
--- a/library/std/src/io/mod.rs
+++ b/library/std/src/io/mod.rs
@@ -2058,6 +2058,7 @@ pub trait Seek {
 /// It is used by the [`Seek`] trait.
 #[derive(Copy, PartialEq, Eq, Clone, Debug)]
 #[stable(feature = "rust1", since = "1.0.0")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "SeekFrom")]
 pub enum SeekFrom {
     /// Sets the offset to the provided number of bytes.
     #[stable(feature = "rust1", since = "1.0.0")]