Revert "time/tzdata: new package"

[gostls13.git] / src / time / zoneinfo_read.go

diff --git a/src/time/zoneinfo_read.go b/src/time/zoneinfo_read.go
index d5824f2670e5951df251c7d88aa93983a0f59831..1e559a62cc291cec68e560b98eabe0275ec85083 100644 (file)
--- a/src/time/zoneinfo_read.go
+++ b/src/time/zoneinfo_read.go
@@ -15,18 +15,6 @@ import (
        "syscall"
 )
 
-// registerLoadFromEmbeddedTZData is called by the time/tzdata package,
-// if it is imported.
-func registerLoadFromEmbeddedTZData(f func(string) (string, error)) {
-       loadFromEmbeddedTZData = f
-}
-
-// loadFromEmbeddedTZData is used to load a specific tzdata file
-// from tzdata information embedded in the binary itself.
-// This is set when the time/tzdata package is imported,
-// via registerLoadFromEmbeddedTzdata.
-var loadFromEmbeddedTZData func(zipname string) (string, error)
-
 // maxFileSize is the max permitted size of files read by readFile.
 // As reference, the zoneinfo.zip distributed by Go is ~350 KB,
 // so 10MB is overkill.
@@ -498,17 +486,6 @@ func loadLocation(name string, sources []string) (z *Location, firstErr error) {
                        firstErr = err
                }
        }
-       if loadFromEmbeddedTZData != nil {
-               zonedata, err := loadFromEmbeddedTZData(name)
-               if err == nil {
-                       if z, err = LoadLocationFromTZData(name, []byte(zonedata)); err == nil {
-                               return z, nil
-                       }
-               }
-               if firstErr == nil && err != syscall.ENOENT {
-                       firstErr = err
-               }
-       }
        if firstErr != nil {
                return nil, firstErr
        }