1 files changed, 7 insertions, 13 deletions
@@ -249,18 +249,14 @@ class Time
 end
 private :apply_offset
- def make_time(date, year, mon, day, hour, min, sec, sec_fraction, zone, offset, now)
 if !year && !mon && !day && !hour && !min && !sec && !sec_fraction
 raise ArgumentError, "no time information in #{date.inspect}"
 end
 off = nil
- if offset
- off = offset
- else
- off_year = year || now.year
- off = zone_offset(zone, off_year) if zone
- end
 if off
 now = now.getlocal(off) if now.utc_offset != off
@@ -291,10 +287,8 @@ class Time
 sec ||= 0
 usec ||= 0
- off = nil
- if offset
- off = offset
- elsif year != off_year
 off = zone_offset(zone, year) if zone
 end
@@ -369,7 +363,7 @@ class Time
 d = Date._parse(date, comp)
 year = d[:year]
 year = yield(year) if year && !comp
- make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], d[:offset], now)
 end
 #
@@ -447,7 +441,7 @@ class Time
 else
 year = d[:year]
 year = yield(year) if year && block_given?
- t = make_time(date, year, d[:mon], d[:mday], d[:hour], d[:min], d[:sec], d[:sec_fraction], d[:zone], d[:offset], now)
 end
 t
 end