Use feature name sval instead of sval2

Author: Techcable

Cargo.toml

@@ -20,7 +20,7 @@ arbitrary = { version = "1.0", optional = true, default-features = false }
 quickcheck = { version = "1.0", optional = true, default-features = false }
 serde = { version = "1.0", optional = true, default-features = false }
 rayon = { version = "1.9", optional = true }
-sval2 = { package = "sval", version = "2", optional = true, default-features = false }
+sval = { version = "2", optional = true, default-features = false }
 
 # deprecated: use borsh's "indexmap" feature instead.
 borsh = { version = "1.2", optional = true, default-features = false }
@@ -52,11 +52,11 @@ sign-tag = true
 tag-name = "{{version}}"
 
 [package.metadata.docs.rs]
-features = ["arbitrary", "quickcheck", "serde", "borsh", "rayon", "sval2"]
+features = ["arbitrary", "quickcheck", "serde", "borsh", "rayon", "sval"]
 rustdoc-args = ["--cfg", "docsrs"]
 
 [workspace]
-members = ["test-nostd", "test-serde", "test-sval2"]
+members = ["test-nostd", "test-serde", "test-sval"]
 
 [lints.clippy]
 style = "allow"

src/lib.rs

@@ -115,8 +115,8 @@ mod macros;
 mod borsh;
 #[cfg(feature = "serde")]
 mod serde;
-#[cfg(feature = "sval2")]
-mod sval2;
+#[cfg(feature = "sval")]
+mod sval;
 mod util;
 
 pub mod map;

src/sval2.rs renamed to src/sval.rs

@@ -1,10 +1,10 @@
 #![cfg_attr(docsrs, doc(cfg(feature = "serde")))]
 
 use crate::{IndexMap, IndexSet};
-use sval2::{Stream, Value};
+use sval::{Stream, Value};
 
 impl<K: Value, V: Value, S> Value for IndexMap<K, V, S> {
-    fn stream<'sval, ST: Stream<'sval> + ?Sized>(&'sval self, stream: &mut ST) -> sval2::Result {
+    fn stream<'sval, ST: Stream<'sval> + ?Sized>(&'sval self, stream: &mut ST) -> sval::Result {
         stream.map_begin(Some(self.len()))?;
 
         for (k, v) in self {
@@ -22,7 +22,7 @@ impl<K: Value, V: Value, S> Value for IndexMap<K, V, S> {
 }
 
 impl<K: Value, S> Value for IndexSet<K, S> {
-    fn stream<'sval, ST: Stream<'sval> + ?Sized>(&'sval self, stream: &mut ST) -> sval2::Result {
+    fn stream<'sval, ST: Stream<'sval> + ?Sized>(&'sval self, stream: &mut ST) -> sval::Result {
         stream.seq_begin(Some(self.len()))?;
 
         for value in self {

test-sval/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "test-sval"
+version = "0.1.0"
+publish = false
+edition = "2021"
+
+[dependencies]
+
+[dev-dependencies]
+fnv = "1.0"
+indexmap = { path = "..", features = ["sval"] }
+sval = { version = "2", features = ["derive"] }
+sval_test = "2"

test-sval2/src/lib.rs renamed to test-sval/src/lib.rs

@@ -2,10 +2,10 @@
 
 use fnv::FnvBuildHasher;
 use indexmap::{indexmap, indexset, IndexMap, IndexSet};
-use sval2_test::{assert_tokens, Token};
+use sval_test::{assert_tokens, Token};
 
 #[test]
-fn test_sval2_map() {
+fn test_sval_map() {
     let map = indexmap! { 1 => 2, 3 => 4 };
     assert_tokens(
         &map,
@@ -29,7 +29,7 @@ fn test_sval2_map() {
 }
 
 #[test]
-fn test_sval2_set() {
+fn test_sval_set() {
     let set = indexset! { 1, 2, 3, 4 };
     assert_tokens(
         &set,
@@ -53,7 +53,7 @@ fn test_sval2_set() {
 }
 
 #[test]
-fn test_sval2_map_fnv_hasher() {
+fn test_sval_map_fnv_hasher() {
     let mut map: IndexMap<i32, i32, FnvBuildHasher> = Default::default();
     map.insert(1, 2);
     map.insert(3, 4);
@@ -79,7 +79,7 @@ fn test_sval2_map_fnv_hasher() {
 }
 
 #[test]
-fn test_sval2_set_fnv_hasher() {
+fn test_sval_set_fnv_hasher() {
     let mut set: IndexSet<i32, FnvBuildHasher> = Default::default();
     set.extend(1..5);
     assert_tokens(