Merge branch 'shuqingzai-sqz-idd'

Author: kuafuRace

.editorconfig

@@ -2,13 +2,11 @@
 root = true
 
 [*]
-indent_style = tab
+indent_style = space
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
+insert_final_newline = true
 
 [*.md]
-indent_size = 4
-trim_trailing_whitespace = false
-
-[lang/*.json]
-indent_size = 4
+trim_trailing_whitespace = false

.github/FUNDING.yml

@@ -1,13 +1,13 @@
 # These are supported funding model platforms
 
-github: gouguoyin
+github: #
 patreon: # Replace with a single Patreon username
 open_collective: go-carbon
-ko_fi: # Replace with a single Ko-fi username
+ko_fi: #go-carbon
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: gouguoyin
-issuehunt: dromara/carbon
+community_bridge: #go-carbon
+liberapay: #go-carbon
+issuehunt: #go-carbon
 otechie: # Replace with a single Otechie username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 custom: ['https://www.gouguoyin.com/zanzhu.html']

.gitignore

@@ -0,0 +1,5 @@
+# IntelliJ project files
+.idea
+*.iml
+out
+gen

README.cn.md

@@ -106,8 +106,11 @@ func (c *Carbon) StartOfWeek() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	dayOfWeek, weekStartsAt := c.DayOfWeek(), int(c.weekStartsAt)
-	return c.SubDays((DaysPerWeek + dayOfWeek - weekStartsAt) % DaysPerWeek).StartOfDay()
+	dayOfWeek, weekStartsAt := c.StdTime().Weekday(), c.WeekStartsAt()
+	if dayOfWeek == weekStartsAt {
+		return c.StartOfDay()
+	}
+	return c.SubDays(int(DaysPerWeek+dayOfWeek-weekStartsAt) % DaysPerWeek).StartOfDay()
 }
 
 // EndOfWeek returns a Carbon instance for end of the week.
@@ -116,8 +119,11 @@ func (c *Carbon) EndOfWeek() *Carbon {
 	if c.IsInvalid() {
 		return c
 	}
-	dayOfWeek, weekEndsAt := c.DayOfWeek(), int(c.weekStartsAt)+DaysPerWeek-1
-	return c.AddDays((DaysPerWeek - dayOfWeek + weekEndsAt) % DaysPerWeek).EndOfDay()
+	dayOfWeek, weekEndsAt := c.StdTime().Weekday(), c.WeekEndsAt()
+	if dayOfWeek == weekEndsAt {
+		return c.EndOfDay()
+	}
+	return c.AddDays(int(DaysPerWeek-dayOfWeek+weekEndsAt) % DaysPerWeek).EndOfDay()
 }
 
 // StartOfDay returns a Carbon instance for start of the day.
@@ -127,7 +133,7 @@ func (c *Carbon) StartOfDay() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, 0, 0, 0, 0)
+	return create(year, month, day, 0, 0, 0, 0, c.Timezone())
 }
 
 // EndOfDay returns a Carbon instance for end of the day.
@@ -137,7 +143,7 @@ func (c *Carbon) EndOfDay() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, 23, 59, 59, 999999999)
+	return create(year, month, day, 23, 59, 59, 999999999, c.Timezone())
 }
 
 // StartOfHour returns a Carbon instance for start of the hour.
@@ -147,7 +153,7 @@ func (c *Carbon) StartOfHour() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, c.Hour(), 0, 0, 0)
+	return create(year, month, day, c.Hour(), 0, 0, 0, c.Timezone())
 }
 
 // EndOfHour returns a Carbon instance for end of the hour.
@@ -157,7 +163,7 @@ func (c *Carbon) EndOfHour() *Carbon {
 		return c
 	}
 	year, month, day := c.Date()
-	return create(year, month, day, c.Hour(), 59, 59, 999999999)
+	return create(year, month, day, c.Hour(), 59, 59, 999999999, c.Timezone())
 }
 
 // StartOfMinute returns a Carbon instance for start of the minute.
@@ -167,7 +173,7 @@ func (c *Carbon) StartOfMinute() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, _ := c.DateTime()
-	return create(year, month, day, hour, minute, 0, 0)
+	return create(year, month, day, hour, minute, 0, 0, c.Timezone())
 }
 
 // EndOfMinute returns a Carbon instance for end of the minute.
@@ -177,7 +183,7 @@ func (c *Carbon) EndOfMinute() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, _ := c.DateTime()
-	return create(year, month, day, hour, minute, 59, 999999999)
+	return create(year, month, day, hour, minute, 59, 999999999, c.Timezone())
 }
 
 // StartOfSecond returns a Carbon instance for start of the second.
@@ -187,7 +193,7 @@ func (c *Carbon) StartOfSecond() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, second := c.DateTime()
-	return create(year, month, day, hour, minute, second, 0)
+	return create(year, month, day, hour, minute, second, 0, c.Timezone())
 }
 
 // EndOfSecond returns a Carbon instance for end of the second.
@@ -197,5 +203,5 @@ func (c *Carbon) EndOfSecond() *Carbon {
 		return c
 	}
 	year, month, day, hour, minute, second := c.DateTime()
-	return create(year, month, day, hour, minute, second, 999999999)
+	return create(year, month, day, hour, minute, second, 999999999, c.Timezone())
 }

README.jp.md

@@ -0,0 +1,165 @@
+package carbon
+
+import (
+	"testing"
+)
+
+func BenchmarkCarbon_StartOfCentury(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfCentury()
+	}
+}
+
+func BenchmarkCarbon_EndOfCentury(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfCentury()
+	}
+}
+
+func BenchmarkCarbon_StartOfDecade(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfDecade()
+	}
+}
+
+func BenchmarkCarbon_EndOfDecade(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfDecade()
+	}
+}
+
+func BenchmarkCarbon_StartOfYear(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfYear()
+	}
+}
+
+func BenchmarkCarbon_EndOfYear(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfYear()
+	}
+}
+
+func BenchmarkCarbon_StartOfQuarter(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfQuarter()
+	}
+}
+
+func BenchmarkCarbon_EndOfQuarter(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfQuarter()
+	}
+}
+
+func BenchmarkCarbon_StartOfMonth(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfMonth()
+	}
+}
+
+func BenchmarkCarbon_EndOfMonth(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfMonth()
+	}
+}
+
+func BenchmarkCarbon_StartOfWeek(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfWeek()
+	}
+}
+
+func BenchmarkCarbon_EndOfWeek(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfWeek()
+	}
+}
+
+func BenchmarkCarbon_StartOfDay(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfDay()
+	}
+}
+
+func BenchmarkCarbon_EndOfDay(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfDay()
+	}
+}
+
+func BenchmarkCarbon_StartOfHour(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfHour()
+	}
+}
+
+func BenchmarkCarbon_EndOfHour(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfHour()
+	}
+}
+
+func BenchmarkCarbon_StartOfMinute(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfMinute()
+	}
+}
+
+func BenchmarkCarbon_EndOfMinute(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfMinute()
+	}
+}
+
+func BenchmarkCarbon_StartOfSecond(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.StartOfSecond()
+	}
+}
+
+func BenchmarkCarbon_EndOfSecond(b *testing.B) {
+	c := Now()
+	b.ResetTimer()
+	for n := 0; n < b.N; n++ {
+		c.EndOfSecond()
+	}
+}

README.md

@@ -143,10 +143,10 @@ func ExampleCarbon_StartOfWeek() {
 	fmt.Println(carbon.Parse("2020-12-31 23:59:59").StartOfWeek().ToString())
 
 	// Output:
-	// 0000-12-31 00:00:00 +0000 UTC
-	// 2019-12-29 00:00:00 +0000 UTC
-	// 2020-08-09 00:00:00 +0000 UTC
-	// 2020-12-27 00:00:00 +0000 UTC
+	// 0001-01-01 00:00:00 +0000 UTC
+	// 2019-12-30 00:00:00 +0000 UTC
+	// 2020-08-10 00:00:00 +0000 UTC
+	// 2020-12-28 00:00:00 +0000 UTC
 }
 
 func ExampleCarbon_EndOfWeek() {
@@ -156,10 +156,10 @@ func ExampleCarbon_EndOfWeek() {
 	fmt.Println(carbon.Parse("2020-12-31 23:59:59").EndOfWeek().ToString())
 
 	// Output:
-	// 0001-01-06 23:59:59.999999999 +0000 UTC
-	// 2020-01-04 23:59:59.999999999 +0000 UTC
-	// 2020-08-15 23:59:59.999999999 +0000 UTC
-	// 2021-01-02 23:59:59.999999999 +0000 UTC
+	// 0001-01-07 23:59:59.999999999 +0000 UTC
+	// 2020-01-05 23:59:59.999999999 +0000 UTC
+	// 2020-08-16 23:59:59.999999999 +0000 UTC
+	// 2021-01-03 23:59:59.999999999 +0000 UTC
 }
 
 func ExampleCarbon_StartOfDay() {