[commit: packages/time] ghc, master: Merge orphan commit into branch 'upstream/master' (c951971)

[git at git.haskell.org]

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

On branches: ghc,master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c95197103ff5a3e3d49dd58a9662591cb2c8e1da

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

commit c95197103ff5a3e3d49dd58a9662591cb2c8e1da
Merge: 6e202ed 098d907
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Feb 21 09:17:28 2017 -0500

    Merge orphan commit into branch 'upstream/master'
    
    Sometime in mid-January there was a force-push to upstream's `master`
    repository, making 6e202edc1b0e32c25bc13194e6496c2c18198463 an orphan
    commit. Unfortunately, there was a period of time when GHC's `time`
    submodule referred to this commit, which means that we need to ensure it
    remains accessible in the history. This merge folds this commit into the
    `master` branch.



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

c95197103ff5a3e3d49dd58a9662591cb2c8e1da
 Checklist                                          |  61 +++++
 benchmark/stack.yaml                               |   2 +-
 changelog.md                                       |   4 +
 lib/Data/Time/Calendar/Gregorian.hs                |  10 +-
 lib/Data/Time/Calendar/Julian.hs                   |  10 +-
 lib/Data/Time/Calendar/JulianYearDay.hs            |  10 +-
 lib/Data/Time/Calendar/MonthDay.hs                 |  16 +-
 lib/Data/Time/Calendar/OrdinalDate.hs              |  40 ++--
 lib/Data/Time/Calendar/Private.hs                  |  40 ++--
 lib/Data/Time/Calendar/WeekDate.hs                 |  10 +-
 lib/Data/Time/Clock/Internal/SystemTime.hs         |  12 +-
 lib/Data/Time/Clock/Internal/UTCTime.hs            |   2 +-
 lib/Data/Time/Clock/System.hs                      |   1 +
 lib/Data/Time/Format.hs                            | 247 ++++++++++++++-------
 lib/Data/Time/Format/Parse.hs                      |   4 +-
 lib/Data/Time/LocalTime.hs                         |   9 +-
 lib/Data/Time/LocalTime/Internal/LocalTime.hs      |   8 +-
 lib/Data/Time/LocalTime/Internal/TimeOfDay.hs      |  16 +-
 lib/Data/Time/LocalTime/Internal/TimeZone.hs       |  34 +--
 lib/Data/Time/LocalTime/Internal/ZonedTime.hs      |   2 +-
 stack.yaml                                         |   2 +-
 test/{Test => }/CurrentTime.hs                     |   0
 test/{Test => }/RealToFracBenchmark.hs             |   0
 test/{Test => }/ShowDST.hs                         |   0
 test/Test/Resolution.hs                            |  39 ----
 test/Test/TestFormat.hs                            | 185 ---------------
 test/Test/TestTimeZone.hs                          |  17 --
 test/Test/TestUtil.hs                              |  62 ------
 test/Test/TestValid.hs                             |  61 -----
 test/Test/Tests.hs                                 |  36 ---
 test/{Test => }/TimeZone.hs                        |   0
 test/{Test => }/UseCases.lhs                       |   0
 test/main/Main.hs                                  |  52 +++++
 test/{Test => main/Test/Calendar}/AddDays.hs       |  13 +-
 test/{Test => main/Test/Calendar}/AddDaysRef.hs    |   2 +-
 .../Test/Calendar/Calendars.hs}                    |  13 +-
 .../Test/Calendar/CalendarsRef.hs}                 |   2 +-
 test/{Test => main/Test/Calendar}/ClipDates.hs     |  13 +-
 test/{Test => main/Test/Calendar}/ClipDatesRef.hs  |   2 +-
 test/{Test => main/Test/Calendar}/ConvertBack.hs   |  11 +-
 .../TestEaster.hs => main/Test/Calendar/Easter.hs} |  13 +-
 .../Test/Calendar/EasterRef.hs}                    |   2 +-
 test/{Test => main/Test/Calendar}/LongWeekYears.hs |  13 +-
 .../Test/Calendar}/LongWeekYearsRef.hs             |   2 +-
 .../Test/Calendar/MonthDay.hs}                     |  13 +-
 .../Test/Calendar/MonthDayRef.hs}                  |   2 +-
 test/main/Test/Calendar/Valid.hs                   |  95 ++++++++
 .../Test/Clock/Conversion.hs}                      |   5 +-
 test/main/Test/Clock/Resolution.hs                 |  52 +++++
 test/{Test/TestTAI.hs => main/Test/Clock/TAI.hs}   |   4 +-
 test/main/Test/Format/Format.hs                    |  73 ++++++
 .../Test/Format/ParseTime.hs}                      | 244 +++++++++-----------
 .../TestTime.hs => main/Test/LocalTime/Time.hs}    |  13 +-
 .../Test/LocalTime/TimeRef.hs}                     |   2 +-
 test/main/Test/TestUtil.hs                         |  37 +++
 test/{Test.hs => unix/Main.hs}                     |  17 +-
 test/unix/Test/Format/Format.hs                    | 190 ++++++++++++++++
 .../Test/Format/FormatStuff.c}                     |   2 +-
 .../Test/Format/FormatStuff.h}                     |   0
 test/unix/Test/LocalTime/TimeZone.hs               |  17 ++
 test/unix/Test/TestUtil.hs                         |  45 ++++
 time.cabal                                         |  97 +++++---
 62 files changed, 1161 insertions(+), 825 deletions(-)