diff options
| author | bors <bors@rust-lang.org> | 2023-12-16 05:35:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-16 05:35:12 +0000 |
| commit | 1c6a06183a1452c2772db370b572e38bac9c5d86 (patch) | |
| tree | a01f49fd3923307062aa105cc5b563f99f443fb5 /compiler/rustc_parse/src | |
| parent | 5c927ab99946c312eed65f28aea15d2a035441f0 (diff) | |
| parent | c5a3d98cc6fe818148506d3e7aaabd512f8969ef (diff) | |
| download | rust-1c6a06183a1452c2772db370b572e38bac9c5d86.tar.gz rust-1c6a06183a1452c2772db370b572e38bac9c5d86.zip | |
Auto merge of #119009 - workingjubilee:rollup-ytexy6j, r=workingjubilee
Rollup of 6 pull requests Successful merges: - #118523 (Add ASCII whitespace trimming functions to `&str`) - #118851 ([std] Add xcoff in object's feature list) - #118989 (Simplify lint decorator derive too) - #118993 (use `if cfg!` instead of `#[cfg]`) - #119003 (NFC: do not clone types that are copy) - #119004 (NFC don't convert types to identical types) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/item.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_parse/src/validate_attr.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_parse/src/parser/item.rs b/compiler/rustc_parse/src/parser/item.rs index 89919247e82..fd7dad36c9d 100644 --- a/compiler/rustc_parse/src/parser/item.rs +++ b/compiler/rustc_parse/src/parser/item.rs @@ -923,7 +923,7 @@ impl<'a> Parser<'a> { ); let where_predicates_split = before_where_clause.predicates.len(); let mut predicates = before_where_clause.predicates; - predicates.extend(after_where_clause.predicates.into_iter()); + predicates.extend(after_where_clause.predicates); let where_clause = WhereClause { has_where_token: before_where_clause.has_where_token || after_where_clause.has_where_token, diff --git a/compiler/rustc_parse/src/validate_attr.rs b/compiler/rustc_parse/src/validate_attr.rs index 81055431f64..d10c8c92257 100644 --- a/compiler/rustc_parse/src/validate_attr.rs +++ b/compiler/rustc_parse/src/validate_attr.rs @@ -215,7 +215,7 @@ fn emit_malformed_attribute( } else { "the following are the possible correct uses" }, - suggestions.into_iter(), + suggestions, Applicability::HasPlaceholders, ) .emit(); |
