diff options
| author | bors <bors@rust-lang.org> | 2024-10-15 11:50:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-15 11:50:31 +0000 |
| commit | f79fae3069c449993eda6b16934da3b144cb8a66 (patch) | |
| tree | 5d40dfbe3306ad9eb29cd79418eec5e03019ef8d /compiler/rustc_parse/src/parser/diagnostics.rs | |
| parent | 00367d523e3dbc7bc7c7a5f5772c2928453fdbc6 (diff) | |
| parent | c99c4d4057dd90ff517ed803d3956ed8ce4de7d1 (diff) | |
| download | rust-f79fae3069c449993eda6b16934da3b144cb8a66.tar.gz rust-f79fae3069c449993eda6b16934da3b144cb8a66.zip | |
Auto merge of #131723 - matthiaskrgr:rollup-krcslig, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #122670 (Fix bug where `option_env!` would return `None` when env var is present but not valid Unicode) - #131095 (Use environment variables instead of command line arguments for merged doctests) - #131339 (Expand set_ptr_value / with_metadata_of docs) - #131652 (Move polarity into `PolyTraitRef` rather than storing it on the side) - #131675 (Update lint message for ABI not supported) - #131681 (Fix up-to-date checking for run-make tests) - #131702 (Suppress import errors for traits that couldve applied for method lookup error) - #131703 (Resolved python deprecation warning in publish_toolstate.py) - #131710 (Remove `'apostrophes'` from `rustc_parse_format`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index f32307f6ed4..a9384501547 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -2113,7 +2113,7 @@ impl<'a> Parser<'a> { && let Some(poly) = bounds .iter() .filter_map(|bound| match bound { - ast::GenericBound::Trait(poly, _) => Some(poly), + ast::GenericBound::Trait(poly) => Some(poly), _ => None, }) .last() |