Merge pull request #304 from scylladb/dk/rename-marshal-folder

Rename marshal folder
scylladb · Oct 11, 2024 · 79792d0 · 79792d0
2 parents 57a9143 + 9397afe
commit 79792d0
Show file tree

Hide file tree

Showing 31 changed files with 15 additions and 15 deletions.
diff --git a/marshal.go b/marshal.go
@@ -20,11 +20,11 @@ import (
 
 	"gopkg.in/inf.v0"
 
-	"github.com/gocql/gocql/marshal/bigint"
-	"github.com/gocql/gocql/marshal/counter"
-	"github.com/gocql/gocql/marshal/cqlint"
-	"github.com/gocql/gocql/marshal/smallint"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/bigint"
+	"github.com/gocql/gocql/serialization/counter"
+	"github.com/gocql/gocql/serialization/cqlint"
+	"github.com/gocql/gocql/serialization/smallint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 var (

diff --git a/marshal/bigint/marshal.go → serialization/bigint/marshal.go b/marshal/bigint/marshal.go → serialization/bigint/marshal.go
diff --git a/marshal/bigint/marshal_utils.go → serialization/bigint/marshal_utils.go b/marshal/bigint/marshal_utils.go → serialization/bigint/marshal_utils.go
diff --git a/marshal/bigint/unmarshal.go → serialization/bigint/unmarshal.go b/marshal/bigint/unmarshal.go → serialization/bigint/unmarshal.go
diff --git a/marshal/bigint/unmarshal_utils.go → serialization/bigint/unmarshal_utils.go b/marshal/bigint/unmarshal_utils.go → serialization/bigint/unmarshal_utils.go
diff --git a/marshal/counter/marshal.go → serialization/counter/marshal.go b/marshal/counter/marshal.go → serialization/counter/marshal.go
diff --git a/marshal/counter/marshal_utils.go → serialization/counter/marshal_utils.go b/marshal/counter/marshal_utils.go → serialization/counter/marshal_utils.go
diff --git a/marshal/counter/unmarshal.go → serialization/counter/unmarshal.go b/marshal/counter/unmarshal.go → serialization/counter/unmarshal.go
diff --git a/marshal/counter/unmarshal_utils.go → serialization/counter/unmarshal_utils.go b/marshal/counter/unmarshal_utils.go → serialization/counter/unmarshal_utils.go
diff --git a/marshal/cqlint/marshal.go → serialization/cqlint/marshal.go b/marshal/cqlint/marshal.go → serialization/cqlint/marshal.go
diff --git a/marshal/cqlint/marshal_utils.go → serialization/cqlint/marshal_utils.go b/marshal/cqlint/marshal_utils.go → serialization/cqlint/marshal_utils.go
diff --git a/marshal/cqlint/unmarshal.go → serialization/cqlint/unmarshal.go b/marshal/cqlint/unmarshal.go → serialization/cqlint/unmarshal.go
diff --git a/marshal/cqlint/unmarshal_utils.go → serialization/cqlint/unmarshal_utils.go b/marshal/cqlint/unmarshal_utils.go → serialization/cqlint/unmarshal_utils.go
diff --git a/marshal/smallint/marshal.go → serialization/smallint/marshal.go b/marshal/smallint/marshal.go → serialization/smallint/marshal.go
diff --git a/marshal/smallint/marshal_utils.go → serialization/smallint/marshal_utils.go b/marshal/smallint/marshal_utils.go → serialization/smallint/marshal_utils.go
diff --git a/marshal/smallint/unmarshal.go → serialization/smallint/unmarshal.go b/marshal/smallint/unmarshal.go → serialization/smallint/unmarshal.go
diff --git a/marshal/smallint/unmarshal_utils.go → serialization/smallint/unmarshal_utils.go b/marshal/smallint/unmarshal_utils.go → serialization/smallint/unmarshal_utils.go
diff --git a/marshal/tinyint/marshal.go → serialization/tinyint/marshal.go b/marshal/tinyint/marshal.go → serialization/tinyint/marshal.go
diff --git a/marshal/tinyint/marshal_utils.go → serialization/tinyint/marshal_utils.go b/marshal/tinyint/marshal_utils.go → serialization/tinyint/marshal_utils.go
diff --git a/marshal/tinyint/unmarshal.go → serialization/tinyint/unmarshal.go b/marshal/tinyint/unmarshal.go → serialization/tinyint/unmarshal.go
diff --git a/marshal/tinyint/unmarshal_utils.go → serialization/tinyint/unmarshal_utils.go b/marshal/tinyint/unmarshal_utils.go → serialization/tinyint/unmarshal_utils.go
diff --git a/tests/serialization/marshal_2_tinyint_corrupt_test.go b/tests/serialization/marshal_2_tinyint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 func TestMarshalTinyintCorrupt(t *testing.T) {

diff --git a/tests/serialization/marshal_2_tinyint_test.go b/tests/serialization/marshal_2_tinyint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/tinyint"
+	"github.com/gocql/gocql/serialization/tinyint"
 )
 
 func TestMarshalTinyint(t *testing.T) {

diff --git a/tests/serialization/marshal_3_smallint_corrupt_test.go b/tests/serialization/marshal_3_smallint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/smallint"
+	"github.com/gocql/gocql/serialization/smallint"
 )
 
 func TestMarshalSmallintCorrupt(t *testing.T) {

diff --git a/tests/serialization/marshal_3_smallint_test.go b/tests/serialization/marshal_3_smallint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/smallint"
+	"github.com/gocql/gocql/serialization/smallint"
 )
 
 func TestMarshalSmallint(t *testing.T) {

diff --git a/tests/serialization/marshal_4_int_corrupt_test.go b/tests/serialization/marshal_4_int_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/cqlint"
+	"github.com/gocql/gocql/serialization/cqlint"
 )
 
 func TestMarshalIntCorrupt(t *testing.T) {

diff --git a/tests/serialization/marshal_4_int_test.go b/tests/serialization/marshal_4_int_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/cqlint"
+	"github.com/gocql/gocql/serialization/cqlint"
 )
 
 func TestMarshalInt(t *testing.T) {

diff --git a/tests/serialization/marshal_5_bigint_corrupt_test.go b/tests/serialization/marshal_5_bigint_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/bigint"
+	"github.com/gocql/gocql/serialization/bigint"
 )
 
 func TestMarshalBigIntCorrupt(t *testing.T) {

diff --git a/tests/serialization/marshal_5_bigint_test.go b/tests/serialization/marshal_5_bigint_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/bigint"
+	"github.com/gocql/gocql/serialization/bigint"
 )
 
 func TestMarshalBigInt(t *testing.T) {

diff --git a/tests/serialization/marshal_6_counter_corrupt_test.go b/tests/serialization/marshal_6_counter_corrupt_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/counter"
+	"github.com/gocql/gocql/serialization/counter"
 )
 
 func TestMarshalCounterCorrupt(t *testing.T) {

diff --git a/tests/serialization/marshal_6_counter_test.go b/tests/serialization/marshal_6_counter_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/gocql/gocql"
 	"github.com/gocql/gocql/internal/tests/serialization"
 	"github.com/gocql/gocql/internal/tests/serialization/mod"
-	"github.com/gocql/gocql/marshal/counter"
+	"github.com/gocql/gocql/serialization/counter"
 )
 
 func TestMarshalCounter(t *testing.T) {