Skip to content

Commit bb67299

Browse files
committed
---
yaml --- r: 44343 b: refs/heads/master c: 7736ed6 h: refs/heads/master i: 44341: e26ce17 44339: 3a37bc9 44335: b67245e v: v3
1 parent 1054e6f commit bb67299

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: c952c0446294d59a5926268f60fb6a2076a7c97f
2+
refs/heads/master: 7736ed6c6251fcb3544d50c15290df6ac9542216
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
55
refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/libstd/json.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,18 +132,19 @@ pub impl Encoder: serialize::Encoder {
132132

133133
// other enums are encoded as vectors:
134134
// Kangaroo(34,"William") => ["Kangaroo",[34,"William"]]
135-
135+
136136
// the default expansion for enums is more verbose than I'd like;
137137
// specifically, the inner pair of brackets seems superfluous,
138138
// BUT the design of the enumeration framework and the requirements
139139
// of the special-case for Option mean that a first argument must
140140
// be encoded "naked"--with no commas--and that the option name
141141
// can't be followed by just a comma, because there might not
142142
// be any elements in the tuple.
143-
144-
// FIXME : this would be more precise and less frightening
143+
144+
// this would be more precise and less frightening
145145
// with fully-qualified option names. To get that information,
146-
// we'd have to change the expansion of auto-encode to pass those along.
146+
// we'd have to change the expansion of auto-encode to pass
147+
// those along.
147148

148149
if (name == ~"Some") {
149150
f();
@@ -170,6 +171,7 @@ pub impl Encoder: serialize::Encoder {
170171
f();
171172
self.wr.write_char(']');
172173
}
174+
173175
fn emit_owned_vec(&self, len: uint, f: fn()) {
174176
self.emit_borrowed_vec(len, f)
175177
}

0 commit comments

Comments
 (0)