diff options
| author | bors <bors@rust-lang.org> | 2016-07-30 04:35:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-30 04:35:39 -0700 |
| commit | ffcbd2deb5ca953512a20785224120437cb310f0 (patch) | |
| tree | b5aef208b408abcf0d7d05ba3dadc6b5cc82fb91 /src/libsyntax_ext | |
| parent | 7580534c3a142c79340576c109f3cd73950996c0 (diff) | |
| parent | 0b64a561f630330ecf3e78b4ffb988d6e7328dce (diff) | |
| download | rust-ffcbd2deb5ca953512a20785224120437cb310f0.tar.gz rust-ffcbd2deb5ca953512a20785224120437cb310f0.zip | |
Auto merge of #35127 - Manishearth:rollup, r=Manishearth
Rollup of 8 pull requests - Successful merges: #35049, #35058, #35063, #35080, #35090, #35094, #35104, #35106 - Failed merges:
Diffstat (limited to 'src/libsyntax_ext')
| -rw-r--r-- | src/libsyntax_ext/format.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libsyntax_ext/format.rs b/src/libsyntax_ext/format.rs index 94bb78edaac..1f6f57c70f7 100644 --- a/src/libsyntax_ext/format.rs +++ b/src/libsyntax_ext/format.rs @@ -406,7 +406,9 @@ impl<'a, 'b> Context<'a, 'b> { let arg_idx = match arg_index_consumed.get_mut(i) { None => 0, // error already emitted elsewhere Some(offset) => { - let arg_idx = self.arg_index_map[i][*offset]; + let ref idx_map = self.arg_index_map[i]; + // unwrap_or branch: error already emitted elsewhere + let arg_idx = *idx_map.get(*offset).unwrap_or(&0); *offset += 1; arg_idx } |