Skip to content

Commit 7eef906

Browse files
epageepage
committed
style: Address warnings
1 parent 813ce3d commit 7eef906

File tree

18 files changed

+193
-246
lines changed

18 files changed

+193
-246
lines changed

‎crates/toml/src/map.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ impl Map<String, Value> {
7878
/// The key may be any borrowed form of the map's key type, but the ordering
7979
/// on the borrowed form *must* match the ordering on the key type.
8080
#[inline]
81-
pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&Value>
81+
pub fn get<Q>(&self, key: &Q) -> Option<&Value>
8282
where
8383
String: Borrow<Q>,
84-
Q: Ord + Eq + Hash,
84+
Q: Ord + Eq + Hash + ?Sized,
8585
{
8686
self.map.get(key)
8787
}
@@ -91,10 +91,10 @@ impl Map<String, Value> {
9191
/// The key may be any borrowed form of the map's key type, but the ordering
9292
/// on the borrowed form *must* match the ordering on the key type.
9393
#[inline]
94-
pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
94+
pub fn contains_key<Q>(&self, key: &Q) -> bool
9595
where
9696
String: Borrow<Q>,
97-
Q: Ord + Eq + Hash,
97+
Q: Ord + Eq + Hash + ?Sized,
9898
{
9999
self.map.contains_key(key)
100100
}
@@ -104,10 +104,10 @@ impl Map<String, Value> {
104104
/// The key may be any borrowed form of the map's key type, but the ordering
105105
/// on the borrowed form *must* match the ordering on the key type.
106106
#[inline]
107-
pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut Value>
107+
pub fn get_mut<Q>(&mut self, key: &Q) -> Option<&mut Value>
108108
where
109109
String: Borrow<Q>,
110-
Q: Ord + Eq + Hash,
110+
Q: Ord + Eq + Hash + ?Sized,
111111
{
112112
self.map.get_mut(key)
113113
}
@@ -130,10 +130,10 @@ impl Map<String, Value> {
130130
/// The key may be any borrowed form of the map's key type, but the ordering
131131
/// on the borrowed form *must* match the ordering on the key type.
132132
#[inline]
133-
pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<Value>
133+
pub fn remove<Q>(&mut self, key: &Q) -> Option<Value>
134134
where
135135
String: Borrow<Q>,
136-
Q: Ord + Eq + Hash,
136+
Q: Ord + Eq + Hash + ?Sized,
137137
{
138138
self.map.remove(key)
139139
}
@@ -241,10 +241,10 @@ impl PartialEq for Map<String, Value> {
241241

242242
/// Access an element of this map. Panics if the given key is not present in the
243243
/// map.
244-
impl<'a, Q: ?Sized> ops::Index<&'a Q> for Map<String, Value>
244+
impl<'a, Q> ops::Index<&'a Q> for Map<String, Value>
245245
where
246246
String: Borrow<Q>,
247-
Q: Ord + Eq + Hash,
247+
Q: Ord + Eq + Hash + ?Sized,
248248
{
249249
type Output = Value;
250250

@@ -255,10 +255,10 @@ where
255255

256256
/// Mutably access an element of this map. Panics if the given key is not
257257
/// present in the map.
258-
impl<'a, Q: ?Sized> ops::IndexMut<&'a Q> for Map<String, Value>
258+
impl<'a, Q> ops::IndexMut<&'a Q> for Map<String, Value>
259259
where
260260
String: Borrow<Q>,
261-
Q: Ord + Eq + Hash,
261+
Q: Ord + Eq + Hash + ?Sized,
262262
{
263263
fn index_mut(&mut self, index: &Q) -> &mut Value {
264264
self.map.get_mut(index).expect("no entry found for key")

‎crates/toml/src/ser.rs

Lines changed: 44 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
/// println!("{}", toml)
4444
/// ```
4545
#[cfg(feature = "display")]
46-
pub fn to_string<T: ?Sized>(value: &T) -> Result<String, Error>
46+
pub fn to_string<T>(value: &T) -> Result<String, Error>
4747
where
48-
T: serde::ser::Serialize,
48+
T: serde::ser::Serialize + ?Sized,
4949
{
5050
let mut output = String::new();
5151
let serializer = Serializer::new(&mut output);
@@ -63,9 +63,9 @@ where
6363
/// For greater customization, instead serialize to a
6464
/// [`toml_edit::DocumentMut`](https://docs.rs/toml_edit/latest/toml_edit/struct.DocumentMut.html).
6565
#[cfg(feature = "display")]
66-
pub fn to_string_pretty<T: ?Sized>(value: &T) -> Result<String, Error>
66+
pub fn to_string_pretty<T>(value: &T) -> Result<String, Error>
6767
where
68-
T: serde::ser::Serialize,
68+
T: serde::ser::Serialize + ?Sized,
6969
{
7070
let mut output = String::new();
7171
let serializer = Serializer::pretty(&mut output);
@@ -301,9 +301,9 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
301301
)
302302
}
303303

304-
fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
304+
fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
305305
where
306-
T: serde::ser::Serialize,
306+
T: serde::ser::Serialize + ?Sized,
307307
{
308308
write_document(
309309
self.dst,
@@ -345,13 +345,9 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
345345
)
346346
}
347347

348-
fn serialize_newtype_struct<T: ?Sized>(
349-
self,
350-
name: &'static str,
351-
v: &T,
352-
) -> Result<Self::Ok, Self::Error>
348+
fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
353349
where
354-
T: serde::ser::Serialize,
350+
T: serde::ser::Serialize + ?Sized,
355351
{
356352
write_document(
357353
self.dst,
@@ -360,15 +356,15 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
360356
)
361357
}
362358

363-
fn serialize_newtype_variant<T: ?Sized>(
359+
fn serialize_newtype_variant<T>(
364360
self,
365361
name: &'static str,
366362
variant_index: u32,
367363
variant: &'static str,
368364
value: &T,
369365
) -> Result<Self::Ok, Self::Error>
370366
where
371-
T: serde::ser::Serialize,
367+
T: serde::ser::Serialize + ?Sized,
372368
{
373369
write_document(
374370
self.dst,
@@ -617,9 +613,9 @@ impl<'d> serde::ser::Serializer for ValueSerializer<'d> {
617613
)
618614
}
619615

620-
fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
616+
fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
621617
where
622-
T: serde::ser::Serialize,
618+
T: serde::ser::Serialize + ?Sized,
623619
{
624620
write_value(
625621
self.dst,
@@ -657,29 +653,25 @@ impl<'d> serde::ser::Serializer for ValueSerializer<'d> {
657653
)
658654
}
659655

660-
fn serialize_newtype_struct<T: ?Sized>(
661-
self,
662-
name: &'static str,
663-
v: &T,
664-
) -> Result<Self::Ok, Self::Error>
656+
fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
665657
where
666-
T: serde::ser::Serialize,
658+
T: serde::ser::Serialize + ?Sized,
667659
{
668660
write_value(
669661
self.dst,
670662
toml_edit::ser::ValueSerializer::new().serialize_newtype_struct(name, v),
671663
)
672664
}
673665

674-
fn serialize_newtype_variant<T: ?Sized>(
666+
fn serialize_newtype_variant<T>(
675667
self,
676668
name: &'static str,
677669
variant_index: u32,
678670
variant: &'static str,
679671
value: &T,
680672
) -> Result<Self::Ok, Self::Error>
681673
where
682-
T: serde::ser::Serialize,
674+
T: serde::ser::Serialize + ?Sized,
683675
{
684676
write_value(
685677
self.dst,
@@ -785,9 +777,9 @@ mod internal {
785777
type Ok = ();
786778
type Error = Error;
787779

788-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
780+
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
789781
where
790-
T: serde::ser::Serialize,
782+
T: serde::ser::Serialize + ?Sized,
791783
{
792784
self.inner.serialize_element(value).map_err(Error::wrap)
793785
}
@@ -801,9 +793,9 @@ mod internal {
801793
type Ok = ();
802794
type Error = Error;
803795

804-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
796+
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
805797
where
806-
T: serde::ser::Serialize,
798+
T: serde::ser::Serialize + ?Sized,
807799
{
808800
self.inner.serialize_element(value).map_err(Error::wrap)
809801
}
@@ -817,9 +809,9 @@ mod internal {
817809
type Ok = ();
818810
type Error = Error;
819811

820-
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
812+
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
821813
where
822-
T: serde::ser::Serialize,
814+
T: serde::ser::Serialize + ?Sized,
823815
{
824816
self.inner.serialize_field(value).map_err(Error::wrap)
825817
}
@@ -833,9 +825,9 @@ mod internal {
833825
type Ok = ();
834826
type Error = Error;
835827

836-
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
828+
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
837829
where
838-
T: serde::ser::Serialize,
830+
T: serde::ser::Serialize + ?Sized,
839831
{
840832
self.inner.serialize_field(value).map_err(Error::wrap)
841833
}
@@ -869,16 +861,16 @@ mod internal {
869861
type Ok = ();
870862
type Error = Error;
871863

872-
fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
864+
fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
873865
where
874-
T: serde::ser::Serialize,
866+
T: serde::ser::Serialize + ?Sized,
875867
{
876868
self.inner.serialize_key(input).map_err(Error::wrap)
877869
}
878870

879-
fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
871+
fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
880872
where
881-
T: serde::ser::Serialize,
873+
T: serde::ser::Serialize + ?Sized,
882874
{
883875
self.inner.serialize_value(value).map_err(Error::wrap)
884876
}
@@ -892,13 +884,9 @@ mod internal {
892884
type Ok = ();
893885
type Error = Error;
894886

895-
fn serialize_field<T: ?Sized>(
896-
&mut self,
897-
key: &'static str,
898-
value: &T,
899-
) -> Result<(), Self::Error>
887+
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
900888
where
901-
T: serde::ser::Serialize,
889+
T: serde::ser::Serialize + ?Sized,
902890
{
903891
self.inner.serialize_field(key, value).map_err(Error::wrap)
904892
}
@@ -954,9 +942,9 @@ mod internal {
954942
type Ok = ();
955943
type Error = Error;
956944

957-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
945+
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
958946
where
959-
T: serde::ser::Serialize,
947+
T: serde::ser::Serialize + ?Sized,
960948
{
961949
self.inner.serialize_element(value).map_err(Error::wrap)
962950
}
@@ -970,9 +958,9 @@ mod internal {
970958
type Ok = ();
971959
type Error = Error;
972960

973-
fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
961+
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
974962
where
975-
T: serde::ser::Serialize,
963+
T: serde::ser::Serialize + ?Sized,
976964
{
977965
self.inner.serialize_element(value).map_err(Error::wrap)
978966
}
@@ -986,9 +974,9 @@ mod internal {
986974
type Ok = ();
987975
type Error = Error;
988976

989-
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
977+
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
990978
where
991-
T: serde::ser::Serialize,
979+
T: serde::ser::Serialize + ?Sized,
992980
{
993981
self.inner.serialize_field(value).map_err(Error::wrap)
994982
}
@@ -1002,9 +990,9 @@ mod internal {
1002990
type Ok = ();
1003991
type Error = Error;
1004992

1005-
fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
993+
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
1006994
where
1007-
T: serde::ser::Serialize,
995+
T: serde::ser::Serialize + ?Sized,
1008996
{
1009997
self.inner.serialize_field(value).map_err(Error::wrap)
1010998
}
@@ -1036,16 +1024,16 @@ mod internal {
10361024
type Ok = ();
10371025
type Error = Error;
10381026

1039-
fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
1027+
fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
10401028
where
1041-
T: serde::ser::Serialize,
1029+
T: serde::ser::Serialize + ?Sized,
10421030
{
10431031
self.inner.serialize_key(input).map_err(Error::wrap)
10441032
}
10451033

1046-
fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
1034+
fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
10471035
where
1048-
T: serde::ser::Serialize,
1036+
T: serde::ser::Serialize + ?Sized,
10491037
{
10501038
self.inner.serialize_value(value).map_err(Error::wrap)
10511039
}
@@ -1059,13 +1047,9 @@ mod internal {
10591047
type Ok = ();
10601048
type Error = Error;
10611049

1062-
fn serialize_field<T: ?Sized>(
1063-
&mut self,
1064-
key: &'static str,
1065-
value: &T,
1066-
) -> Result<(), Self::Error>
1050+
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
10671051
where
1068-
T: serde::ser::Serialize,
1052+
T: serde::ser::Serialize + ?Sized,
10691053
{
10701054
self.inner.serialize_field(key, value).map_err(Error::wrap)
10711055
}

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy