Skip to content

Commit 28a8f0b

Browse files
committed
---
yaml --- r: 37031 b: refs/heads/try2 c: 9e5a416 h: refs/heads/master i: 37029: 4caf078 37027: 7dac4df 37023: d07be29 v: v3
1 parent a26aa22 commit 28a8f0b

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
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: af298deff7141c3b8b95acb94ef2145d2ef9adc0
8+
refs/heads/try2: 9e5a4166d5bf0ebad622535a6619e12014fc6470
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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)