Skip to content

Commit 0bfb645

Browse files
zcheezchee
committed
msgpack: rename formats n field to fn
1 parent 49dda9c commit 0bfb645

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎msgpack/unpack.go

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ func (d *Decoder) Unpack() error {
172172
f := formats[code]
173173
d.t = f.t
174174

175-
d.n, err = f.n(d, code)
175+
d.n, err = f.fn(d, code)
176176
if err != nil {
177177
return d.fatal(err)
178178
}
@@ -243,185 +243,185 @@ func (d *Decoder) skipCount() int {
243243

244244
var formats = [256]*struct {
245245
t Type
246-
n func(d *Decoder, code byte) (uint64, error)
246+
fn func(d *Decoder, code byte) (uint64, error)
247247
more bool
248248
}{
249249
fixIntCodeMin: {
250-
t: Int,
251-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code), nil },
250+
t: Int,
251+
fn: func(d *Decoder, code byte) (uint64, error) { return uint64(code), nil },
252252
},
253253
fixMapCodeMin: {
254-
t: MapLen,
255-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixMapCodeMin), nil },
254+
t: MapLen,
255+
fn: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixMapCodeMin), nil },
256256
},
257257
fixArrayCodeMin: {
258-
t: ArrayLen,
259-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixArrayCodeMin), nil },
258+
t: ArrayLen,
259+
fn: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixArrayCodeMin), nil },
260260
},
261261
fixStringCodeMin: {
262262
t: String,
263-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixStringCodeMin), nil },
263+
fn: func(d *Decoder, code byte) (uint64, error) { return uint64(code) - uint64(fixStringCodeMin), nil },
264264
more: true,
265265
},
266266
nilCode: {
267-
t: Nil,
268-
n: func(d *Decoder, code byte) (uint64, error) { return 0, nil },
267+
t: Nil,
268+
fn: func(d *Decoder, code byte) (uint64, error) { return 0, nil },
269269
},
270270
unusedCode: {
271271
t: Invalid,
272-
n: func(d *Decoder, code byte) (uint64, error) {
272+
fn: func(d *Decoder, code byte) (uint64, error) {
273273
return 0, fmt.Errorf("msgpack: unknown format code %x", code)
274274
},
275275
},
276276
falseCode: {
277-
t: Bool,
278-
n: func(d *Decoder, code byte) (uint64, error) { return 0, nil },
277+
t: Bool,
278+
fn: func(d *Decoder, code byte) (uint64, error) { return 0, nil },
279279
},
280280
trueCode: {
281-
t: Bool,
282-
n: func(d *Decoder, code byte) (uint64, error) { return 1, nil },
281+
t: Bool,
282+
fn: func(d *Decoder, code byte) (uint64, error) { return 1, nil },
283283
},
284284
binary8Code: {
285285
t: Binary,
286-
n: (*Decoder).read1,
286+
fn: (*Decoder).read1,
287287
more: true,
288288
},
289289
binary16Code: {
290290
t: Binary,
291-
n: (*Decoder).read2,
291+
fn: (*Decoder).read2,
292292
more: true,
293293
},
294294
binary32Code: {
295295
t: Binary,
296-
n: (*Decoder).read4,
296+
fn: (*Decoder).read4,
297297
more: true,
298298
},
299299
ext8Code: {
300300
t: Extension,
301-
n: (*Decoder).read1,
301+
fn: (*Decoder).read1,
302302
more: true,
303303
},
304304
ext16Code: {
305305
t: Extension,
306-
n: (*Decoder).read2,
306+
fn: (*Decoder).read2,
307307
more: true,
308308
},
309309
ext32Code: {
310310
t: Extension,
311-
n: (*Decoder).read4,
311+
fn: (*Decoder).read4,
312312
more: true,
313313
},
314314
float32Code: {
315315
t: Float,
316-
n: func(d *Decoder, code byte) (uint64, error) {
316+
fn: func(d *Decoder, code byte) (uint64, error) {
317317
n, err := d.read4(code)
318318
return math.Float64bits(float64(math.Float32frombits(uint32(n)))), err
319319
},
320320
},
321321
float64Code: {
322-
t: Float,
323-
n: (*Decoder).read8,
322+
t: Float,
323+
fn: (*Decoder).read8,
324324
},
325325
uint8Code: {
326-
t: Uint,
327-
n: (*Decoder).read1,
326+
t: Uint,
327+
fn: (*Decoder).read1,
328328
},
329329
uint16Code: {
330-
t: Uint,
331-
n: (*Decoder).read2,
330+
t: Uint,
331+
fn: (*Decoder).read2,
332332
},
333333
uint32Code: {
334-
t: Uint,
335-
n: (*Decoder).read4,
334+
t: Uint,
335+
fn: (*Decoder).read4,
336336
},
337337
uint64Code: {
338-
t: Uint,
339-
n: (*Decoder).read8,
338+
t: Uint,
339+
fn: (*Decoder).read8,
340340
},
341341
int8Code: {
342342
t: Int,
343-
n: func(d *Decoder, code byte) (uint64, error) {
343+
fn: func(d *Decoder, code byte) (uint64, error) {
344344
n, err := d.read1(code)
345345
return uint64(int64(int8(n))), err
346346
},
347347
},
348348
int16Code: {
349349
t: Int,
350-
n: func(d *Decoder, code byte) (uint64, error) {
350+
fn: func(d *Decoder, code byte) (uint64, error) {
351351
n, err := d.read2(code)
352352
return uint64(int64(int16(n))), err
353353
},
354354
},
355355
int32Code: {
356356
t: Int,
357-
n: func(d *Decoder, code byte) (uint64, error) {
357+
fn: func(d *Decoder, code byte) (uint64, error) {
358358
n, err := d.read4(code)
359359
return uint64(int64(int32(n))), err
360360
},
361361
},
362362
int64Code: {
363-
t: Int,
364-
n: (*Decoder).read8,
363+
t: Int,
364+
fn: (*Decoder).read8,
365365
},
366366
fixExt1Code: {
367367
t: Extension,
368-
n: func(d *Decoder, code byte) (uint64, error) { return 1, nil },
368+
fn: func(d *Decoder, code byte) (uint64, error) { return 1, nil },
369369
more: true,
370370
},
371371
fixExt2Code: {
372372
t: Extension,
373-
n: func(d *Decoder, code byte) (uint64, error) { return 2, nil },
373+
fn: func(d *Decoder, code byte) (uint64, error) { return 2, nil },
374374
more: true,
375375
},
376376
fixExt4Code: {
377377
t: Extension,
378-
n: func(d *Decoder, code byte) (uint64, error) { return 4, nil },
378+
fn: func(d *Decoder, code byte) (uint64, error) { return 4, nil },
379379
more: true,
380380
},
381381
fixExt8Code: {
382382
t: Extension,
383-
n: func(d *Decoder, code byte) (uint64, error) { return 8, nil },
383+
fn: func(d *Decoder, code byte) (uint64, error) { return 8, nil },
384384
more: true,
385385
},
386386
fixExt16Code: {
387387
t: Extension,
388-
n: func(d *Decoder, code byte) (uint64, error) { return 16, nil },
388+
fn: func(d *Decoder, code byte) (uint64, error) { return 16, nil },
389389
more: true,
390390
},
391391
string8Code: {
392392
t: String,
393-
n: (*Decoder).read1,
393+
fn: (*Decoder).read1,
394394
more: true,
395395
},
396396
string16Code: {
397397
t: String,
398-
n: (*Decoder).read2,
398+
fn: (*Decoder).read2,
399399
more: true,
400400
},
401401
string32Code: {
402402
t: String,
403-
n: (*Decoder).read4,
403+
fn: (*Decoder).read4,
404404
more: true,
405405
},
406406
array16Code: {
407-
t: ArrayLen,
408-
n: (*Decoder).read2,
407+
t: ArrayLen,
408+
fn: (*Decoder).read2,
409409
},
410410
array32Code: {
411-
t: ArrayLen,
412-
n: (*Decoder).read4,
411+
t: ArrayLen,
412+
fn: (*Decoder).read4,
413413
},
414414
map16Code: {
415-
t: MapLen,
416-
n: (*Decoder).read2,
415+
t: MapLen,
416+
fn: (*Decoder).read2,
417417
},
418418
map32Code: {
419-
t: MapLen,
420-
n: (*Decoder).read4,
419+
t: MapLen,
420+
fn: (*Decoder).read4,
421421
},
422422
negFixIntCodeMin: {
423-
t: Int,
424-
n: func(d *Decoder, code byte) (uint64, error) { return uint64(int64(int8(code))), nil },
423+
t: Int,
424+
fn: func(d *Decoder, code byte) (uint64, error) { return uint64(int64(int8(code))), nil },
425425
},
426426
}
427427

0 commit comments

Comments
 (0)