diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-11-29 10:41:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-29 10:41:36 +0100 |
| commit | 7df49eff100363a8cd1da17c1758c3b91a8d47fc (patch) | |
| tree | 6dd9a8fdedd3a2c5f04d4171dd97395e5ecfcb76 | |
| parent | a2f924a255f472953389e9009321f2e3805afe2c (diff) | |
| parent | cc53f1356d5f9d625b59f2f35873761e87e914ab (diff) | |
| download | rust-7df49eff100363a8cd1da17c1758c3b91a8d47fc.tar.gz rust-7df49eff100363a8cd1da17c1758c3b91a8d47fc.zip | |
Rollup merge of #91327 - dtolnay:exact, r=michaelwoerister
Delete an unreachable codepath from format_args implementation
| -rw-r--r-- | compiler/rustc_builtin_macros/src/format.rs | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/compiler/rustc_builtin_macros/src/format.rs b/compiler/rustc_builtin_macros/src/format.rs index 70e125d6887..62a55c0e49e 100644 --- a/compiler/rustc_builtin_macros/src/format.rs +++ b/compiler/rustc_builtin_macros/src/format.rs @@ -88,8 +88,8 @@ struct Context<'a, 'b> { /// * Implicit argument resolution: `"{1:.0$} {2:.foo$} {1:.3$} {4:.0$}"` /// * Name resolution: `"{1:.0$} {2:.5$} {1:.3$} {4:.0$}"` /// * `count_positions` (in JSON): `{0: 0, 5: 1, 3: 2}` - /// * `count_args`: `vec![Exact(0), Exact(5), Exact(3)]` - count_args: Vec<Position>, + /// * `count_args`: `vec![0, 5, 3]` + count_args: Vec<usize>, /// Relative slot numbers for count arguments. count_positions: FxHashMap<usize, usize>, /// Number of count slots assigned. @@ -513,7 +513,7 @@ impl<'a, 'b> Context<'a, 'b> { if let Entry::Vacant(e) = self.count_positions.entry(arg) { let i = self.count_positions_count; e.insert(i); - self.count_args.push(Exact(arg)); + self.count_args.push(arg); self.count_positions_count += 1; } } @@ -774,11 +774,7 @@ impl<'a, 'b> Context<'a, 'b> { // (the span is otherwise unavailable in MIR) heads.push(self.ecx.expr_addr_of(e.span.with_ctxt(self.macsp.ctxt()), e)); } - for pos in self.count_args { - let index = match pos { - Exact(i) => i, - _ => panic!("should never happen"), - }; + for index in self.count_args { let span = spans_pos[index]; args.push(Context::format_arg(self.ecx, self.macsp, span, &Count, index)); } |
