diff options
| author | bors <bors@rust-lang.org> | 2022-08-02 17:18:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-08-02 17:18:58 +0000 |
| commit | 4493a0f4724c0bae1436242d76cccc9c0a287b80 (patch) | |
| tree | 3e18e27433bbabc2a58f2bd9b5fffa2ff4fd9d47 /compiler/rustc_trait_selection/src | |
| parent | 06f4950cbdb5a0a59063156af6383283b1aae30e (diff) | |
| parent | 269d15fbf88e6c8ca41f058190ece0e484d5beba (diff) | |
| download | rust-4493a0f4724c0bae1436242d76cccc9c0a287b80.tar.gz rust-4493a0f4724c0bae1436242d76cccc9c0a287b80.zip | |
Auto merge of #100063 - matthiaskrgr:rollup-lznouys, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #99987 (Always include a position span in `rustc_parse_format::Argument`) - #100005 (Remove Clean trait for ast::Attribute and improve Attributes::from_ast) - #100025 (Remove redundant `TransferWrapper` struct) - #100045 (Properly reject the `may_unwind` option in `global_asm!`) - #100052 (RISC-V ASM test: relax label name constraint.) - #100053 (move [`assertions_on_result_states`] to restriction) - #100057 (Remove more Clean trait implementations) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_trait_selection/src')
| -rw-r--r-- | compiler/rustc_trait_selection/src/traits/on_unimplemented.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs b/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs index 4d3b0b4cf07..9227bbf011d 100644 --- a/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs +++ b/compiler/rustc_trait_selection/src/traits/on_unimplemented.rs @@ -300,7 +300,7 @@ impl<'tcx> OnUnimplementedFormatString { match token { Piece::String(_) => (), // Normal string, no need to check it Piece::NextArgument(a) => match a.position { - Position::ArgumentNamed(s, _) => { + Position::ArgumentNamed(s) => { match Symbol::intern(s) { // `{Self}` is allowed kw::SelfUpper => (), @@ -386,7 +386,7 @@ impl<'tcx> OnUnimplementedFormatString { .map(|p| match p { Piece::String(s) => s, Piece::NextArgument(a) => match a.position { - Position::ArgumentNamed(s, _) => { + Position::ArgumentNamed(s) => { let s = Symbol::intern(s); match generic_map.get(&s) { Some(val) => val, |