Skip to content

Commit d0dc657

Browse files
committed
---
yaml --- r: 52134 b: refs/heads/dist-snap c: 9e5a416 h: refs/heads/master v: v3
1 parent e3ee7d3 commit d0dc657

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
10-
refs/heads/dist-snap: af298deff7141c3b8b95acb94ef2145d2ef9adc0
10+
refs/heads/dist-snap: 9e5a4166d5bf0ebad622535a6619e12014fc6470
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libcore/extfmt.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,17 +214,19 @@ pub mod ct {
214214
err: ErrorFn) ->
215215
Parsed<Piece> {
216216
let parm = parse_parameter(s, i, lim);
217-
let flags = parse_flags(s, parm.next, lim);
218-
let width = parse_count(s, flags.next, lim);
217+
// avoid copying ~[Flag] by destructuring
218+
let Parsed {val: flags_val, next: flags_next} = parse_flags(s,
219+
parm.next, lim);
220+
let width = parse_count(s, flags_next, lim);
219221
let prec = parse_precision(s, width.next, lim);
220222
let ty = parse_type(s, prec.next, lim, err);
221-
return Parsed::new(
223+
Parsed::new(
222224
PieceConv(Conv {param: parm.val,
223-
flags: copy flags.val,
225+
flags: flags_val,
224226
width: width.val,
225227
precision: prec.val,
226228
ty: ty.val}),
227-
ty.next);
229+
ty.next)
228230
}
229231
pub fn parse_parameter(s: &str, i: uint, lim: uint) ->
230232
Parsed<Option<uint>> {

0 commit comments

Comments
 (0)