nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 20:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #133686 - samueltardieu:push-xkxwxzxqokuu, r=compiler-errors

Browse Source 
Add diagnostic item for `std::ops::ControlFlow`

This will be used in Clippy to detect useless conversions done through `ControlFlow::map_break()` and `ControlFlow::map_continue()`.
This commit is contained in:
Matthias Krüger 2024-12-01 08:15:25 +01:00 committed by GitHub
commit 3d365795fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_span/src/symbol.rs
View File

@ -182,6 +182,7 @@ symbols! {
ConstParamTy_, ConstParamTy_,
Context, Context,
Continue, Continue,
ControlFlow,
Copy, Copy,
Cow, Cow,
Debug, Debug,

1
library/core/src/ops/control_flow.rs
View File

@ -79,6 +79,7 @@ use crate::{convert, ops};
/// [`Break`]: ControlFlow::Break /// [`Break`]: ControlFlow::Break
/// [`Continue`]: ControlFlow::Continue /// [`Continue`]: ControlFlow::Continue
#[stable(feature = "control_flow_enum_type", since = "1.55.0")] #[stable(feature = "control_flow_enum_type", since = "1.55.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "ControlFlow")]
// ControlFlow should not implement PartialOrd or Ord, per RFC 3058: // ControlFlow should not implement PartialOrd or Ord, per RFC 3058:
// https://rust-lang.github.io/rfcs/3058-try-trait-v2.html#traits-for-controlflow // https://rust-lang.github.io/rfcs/3058-try-trait-v2.html#traits-for-controlflow
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]