mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #95276 - FoseFx:clippy_trim_split_whitespace, r=flip1995

Browse Source 
add diagnostic items for clippy's `trim_split_whitespace`

Adding the following diagnostic items:
 * str_split_whitespace,
 * str_trim,
 * str_trim_start,
 * str_trim_end

They are needed for https://github.com/rust-lang/rust-clippy/pull/8575

r? `@flip1995`
This commit is contained in:
Dylan DPC 2022-03-25 01:34:32 +01:00 committed by GitHub
commit 3716c4275f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1347,6 +1347,10 @@ symbols! {
store, store,
str, str,
str_alloc, str_alloc,
str_split_whitespace,
str_trim,
str_trim_end,
str_trim_start,
stringify, stringify,
stringify_macro, stringify_macro,
struct_field_attributes, struct_field_attributes,

4
library/core/src/str/mod.rs
View File

@ -904,6 +904,7 @@ impl str {
#[must_use = "this returns the split string as an iterator, \ #[must_use = "this returns the split string as an iterator, \
without modifying the original"] without modifying the original"]
#[stable(feature = "split_whitespace", since = "1.1.0")] #[stable(feature = "split_whitespace", since = "1.1.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "str_split_whitespace")]
#[inline] #[inline]
pub fn split_whitespace(&self) -> SplitWhitespace<'_> { pub fn split_whitespace(&self) -> SplitWhitespace<'_> {
SplitWhitespace { inner: self.split(IsWhitespace).filter(IsNotEmpty) } SplitWhitespace { inner: self.split(IsWhitespace).filter(IsNotEmpty) }
@ -1846,6 +1847,7 @@ impl str {
#[must_use = "this returns the trimmed string as a slice, \ #[must_use = "this returns the trimmed string as a slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "str_trim")]
pub fn trim(&self) -> &str { pub fn trim(&self) -> &str {
self.trim_matches(|c: char| c.is_whitespace()) self.trim_matches(|c: char| c.is_whitespace())
} }
@ -1884,6 +1886,7 @@ impl str {
#[must_use = "this returns the trimmed string as a new slice, \ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")] #[stable(feature = "trim_direction", since = "1.30.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "str_trim_start")]
pub fn trim_start(&self) -> &str { pub fn trim_start(&self) -> &str {
self.trim_start_matches(|c: char| c.is_whitespace()) self.trim_start_matches(|c: char| c.is_whitespace())
} }
@ -1922,6 +1925,7 @@ impl str {
#[must_use = "this returns the trimmed string as a new slice, \ #[must_use = "this returns the trimmed string as a new slice, \
without modifying the original"] without modifying the original"]
#[stable(feature = "trim_direction", since = "1.30.0")] #[stable(feature = "trim_direction", since = "1.30.0")]
#[cfg_attr(not(test), rustc_diagnostic_item = "str_trim_end")]
pub fn trim_end(&self) -> &str { pub fn trim_end(&self) -> &str {
self.trim_end_matches(|c: char| c.is_whitespace()) self.trim_end_matches(|c: char| c.is_whitespace())
} }