Skip to content

Commit fdca5c3

Browse files
committed
Fix go vet
1 parent 30ad7ce commit fdca5c3

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

types/floats/types.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@ type Polygon = geom.Polygon[float64]
1212
type RegularPolygon = geom.RegularPolygon[float64]
1313

1414
func ToPoint[T geom.Number](point geom.Point[T]) Point {
15-
return Point{float64(point.X()), float64(point.Y())}
15+
return Point{X: float64(point.X), Y: float64(point.Y)}
1616
}
1717

1818
func ToVector[T geom.Number](vector geom.Vector[T]) Vector {
19-
return Vector{float64(vector.X()), float64(vector.Y())}
19+
return Vector{X: float64(vector.X), Y: float64(vector.Y)}
2020
}
2121

2222
func ToSize[T geom.Number](size geom.Size[T]) Size {
23-
return Size{float64(size.Width()), float64(size.Height())}
23+
return Size{Width: float64(size.Width), Height: float64(size.Height)}
2424
}
2525

2626
func ToCircle[T geom.Number](circle geom.Circle[T]) Circle {
27-
return Circle{ToPoint(circle.Center), float64(circle.Radius)}
27+
return Circle{Center: ToPoint(circle.Center), Radius: float64(circle.Radius)}
2828
}
2929

3030
func ToLine[T geom.Number](line geom.Line[T]) Line {
31-
return Line{ToPoint(line.Start), ToPoint(line.End)}
31+
return Line{Start: ToPoint(line.Start), End: ToPoint(line.End)}
3232
}
3333

3434
func ToRectangle[T geom.Number](rectangle geom.Rectangle[T]) Rectangle {
35-
return Rectangle{ToPoint(rectangle.Center), ToSize(rectangle.Size)}
35+
return Rectangle{Center: ToPoint(rectangle.Center), Size: ToSize(rectangle.Size)}
3636
}
3737

3838
func ToPolygon[T geom.Number](polygon geom.Polygon[T]) Polygon {
39-
return Polygon{geom.Transform(polygon.Vertices, func(point geom.Point[T]) Point {
39+
return Polygon{Vertices: geom.Transform(polygon.Vertices, func(point geom.Point[T]) Point {
4040
return ToPoint(point)
4141
})}
4242
}
4343

4444
func ToRegularPolygon[T geom.Number](polygon geom.RegularPolygon[T]) RegularPolygon {
45-
return RegularPolygon{ToPoint(polygon.Center), ToSize(polygon.Size), polygon.N}
45+
return RegularPolygon{Center: ToPoint(polygon.Center), Size: ToSize(polygon.Size), N: polygon.N}
4646
}

types/ints/types.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,35 +12,35 @@ type Polygon = geom.Polygon[int]
1212
type RegularPolygon = geom.RegularPolygon[int]
1313

1414
func ToPoint[T geom.Number](point geom.Point[T]) Point {
15-
return Point{geom.Cast[int](float64(point.X)), geom.Cast[int](float64(point.Y))}
15+
return Point{X: geom.Cast[int](float64(point.X)), Y: geom.Cast[int](float64(point.Y))}
1616
}
1717

1818
func ToVector[T geom.Number](vector geom.Vector[T]) Vector {
19-
return Vector{geom.Cast[int](float64(vector.X)), geom.Cast[int](float64(vector.Y))}
19+
return Vector{X: geom.Cast[int](float64(vector.X)), Y: geom.Cast[int](float64(vector.Y))}
2020
}
2121

2222
func ToSize[T geom.Number](size geom.Size[T]) Size {
23-
return Size{geom.Cast[int](float64(size.Width)), geom.Cast[int](float64(size.Height))}
23+
return Size{Width: geom.Cast[int](float64(size.Width)), Height: geom.Cast[int](float64(size.Height))}
2424
}
2525

2626
func ToCircle[T geom.Number](circle geom.Circle[T]) Circle {
27-
return Circle{ToPoint(circle.Center), geom.Cast[int](float64(circle.Radius))}
27+
return Circle{Center: ToPoint(circle.Center), Radius: geom.Cast[int](float64(circle.Radius))}
2828
}
2929

3030
func ToLine[T geom.Number](line geom.Line[T]) Line {
31-
return Line{ToPoint(line.Start), ToPoint(line.End)}
31+
return Line{Start: ToPoint(line.Start), End: ToPoint(line.End)}
3232
}
3333

3434
func ToRectangle[T geom.Number](rectangle geom.Rectangle[T]) Rectangle {
35-
return Rectangle{ToPoint(rectangle.Center), ToSize(rectangle.Size)}
35+
return Rectangle{Center: ToPoint(rectangle.Center), Size: ToSize(rectangle.Size)}
3636
}
3737

3838
func ToPolygon[T geom.Number](polygon geom.Polygon[T]) Polygon {
39-
return Polygon{geom.Transform(polygon.Vertices, func(point geom.Point[T]) Point {
39+
return Polygon{Vertices: geom.Transform(polygon.Vertices, func(point geom.Point[T]) Point {
4040
return ToPoint(point)
4141
})}
4242
}
4343

4444
func ToRegularPolygon[T geom.Number](polygon geom.RegularPolygon[T]) RegularPolygon {
45-
return RegularPolygon{ToPoint(polygon.Center), ToSize(polygon.Size), polygon.N}
45+
return RegularPolygon{Center: ToPoint(polygon.Center), Size: ToSize(polygon.Size), N: polygon.N}
4646
}

0 commit comments

Comments
 (0)