[commit: packages/binary] master: Merge remote-tracking branch 'upstream/master' (d67bc13)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/d67bc13a3dac83ebbe232678554e24c1f1a6d548

>---------------------------------------------------------------

commit d67bc13a3dac83ebbe232678554e24c1f1a6d548
Merge: 333f836 b660e3d
Author: Daniel Casanueva <dhelta.diaz at gmail.com>
Date:   Thu Jun 7 13:17:29 2018 +0200

    Merge remote-tracking branch 'upstream/master'



>---------------------------------------------------------------

d67bc13a3dac83ebbe232678554e24c1f1a6d548
 .travis.yml                      |  23 ++-
 benchmarks/Builder.hs            |   2 +
 benchmarks/Cabal24.hs            | 360 +++++++++++++++++++++++++++++++++++++++
 benchmarks/GenericsBench.hs      |   2 +-
 benchmarks/GenericsBenchCache.hs |  87 +++-------
 benchmarks/GenericsBenchTypes.hs |  19 +--
 binary.cabal                     |   7 +-
 generics-bench.cache.gz          | Bin 0 -> 7460114 bytes
 8 files changed, 405 insertions(+), 95 deletions(-)