diff options
| author | Jonas Schievink <jonasschievink@gmail.com> | 2020-09-25 02:29:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-25 02:29:44 +0200 |
| commit | b8ab6eb217effa514ec1742a8042469d00993080 (patch) | |
| tree | 445132f62a8167757a02ff4cbd90f037aabb73bb | |
| parent | dc4f39c43f0f798c414474263b8d3e5b90c32e27 (diff) | |
| parent | d76b80768c4e5f1ee879af12db30d8930e50f70d (diff) | |
| download | rust-b8ab6eb217effa514ec1742a8042469d00993080.tar.gz rust-b8ab6eb217effa514ec1742a8042469d00993080.zip | |
Rollup merge of #77081 - LingMan:patch-1, r=jonas-schievink
Merge two almost identical match arms
| -rw-r--r-- | compiler/rustc_builtin_macros/src/format_foreign.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_builtin_macros/src/format_foreign.rs b/compiler/rustc_builtin_macros/src/format_foreign.rs index b39423b86e7..ff81b5eca13 100644 --- a/compiler/rustc_builtin_macros/src/format_foreign.rs +++ b/compiler/rustc_builtin_macros/src/format_foreign.rs @@ -518,8 +518,7 @@ pub mod printf { .and_then(|end| end.at_next_cp()) .map(|end| (next.slice_between(end).unwrap(), end)); let end = match end { - Some(("32", end)) => end, - Some(("64", end)) => end, + Some(("32" | "64", end)) => end, _ => next, }; state = Type; |