Skip to content

Commit

Permalink
Merge pull request #725 from epage/update
Browse files Browse the repository at this point in the history 
style: Address warnings
  • Loading branch information
@epage
epage committed May 2, 2024
2 parents 813ce3d + 7eef906 commit f8b1b26
Show file tree
Hide file tree
Showing 18 changed files with 193 additions and 246 deletions.
24 changes: 12 additions & 12 deletions crates/toml/src/map.rs
View file
Expand Up @@ -78,10 +78,10 @@ impl Map<String, Value> {
/// The key may be any borrowed form of the map's key type, but the ordering
/// on the borrowed form *must* match the ordering on the key type.
#[inline]
pub fn get<Q: ?Sized>(&self, key: &Q) -> Option<&Value>
pub fn get<Q>(&self, key: &Q) -> Option<&Value>
where
String: Borrow<Q>,
Q: Ord + Eq + Hash,
Q: Ord + Eq + Hash + ?Sized,
{
self.map.get(key)
}
Expand All @@ -91,10 +91,10 @@ impl Map<String, Value> {
/// The key may be any borrowed form of the map's key type, but the ordering
/// on the borrowed form *must* match the ordering on the key type.
#[inline]
pub fn contains_key<Q: ?Sized>(&self, key: &Q) -> bool
pub fn contains_key<Q>(&self, key: &Q) -> bool
where
String: Borrow<Q>,
Q: Ord + Eq + Hash,
Q: Ord + Eq + Hash + ?Sized,
{
self.map.contains_key(key)
}
Expand All @@ -104,10 +104,10 @@ impl Map<String, Value> {
/// The key may be any borrowed form of the map's key type, but the ordering
/// on the borrowed form *must* match the ordering on the key type.
#[inline]
pub fn get_mut<Q: ?Sized>(&mut self, key: &Q) -> Option<&mut Value>
pub fn get_mut<Q>(&mut self, key: &Q) -> Option<&mut Value>
where
String: Borrow<Q>,
Q: Ord + Eq + Hash,
Q: Ord + Eq + Hash + ?Sized,
{
self.map.get_mut(key)
}
Expand All @@ -130,10 +130,10 @@ impl Map<String, Value> {
/// The key may be any borrowed form of the map's key type, but the ordering
/// on the borrowed form *must* match the ordering on the key type.
#[inline]
pub fn remove<Q: ?Sized>(&mut self, key: &Q) -> Option<Value>
pub fn remove<Q>(&mut self, key: &Q) -> Option<Value>
where
String: Borrow<Q>,
Q: Ord + Eq + Hash,
Q: Ord + Eq + Hash + ?Sized,
{
self.map.remove(key)
}
Expand Down Expand Up @@ -241,10 +241,10 @@ impl PartialEq for Map<String, Value> {

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

Expand All @@ -255,10 +255,10 @@ where

/// Mutably access an element of this map. Panics if the given key is not
/// present in the map.
impl<'a, Q: ?Sized> ops::IndexMut<&'a Q> for Map<String, Value>
impl<'a, Q> ops::IndexMut<&'a Q> for Map<String, Value>
where
String: Borrow<Q>,
Q: Ord + Eq + Hash,
Q: Ord + Eq + Hash + ?Sized,
{
fn index_mut(&mut self, index: &Q) -> &mut Value {
self.map.get_mut(index).expect("no entry found for key")
Expand Down
104 changes: 44 additions & 60 deletions crates/toml/src/ser.rs
View file
Expand Up @@ -43,9 +43,9 @@
/// println!("{}", toml)
/// ```
#[cfg(feature = "display")]
pub fn to_string<T: ?Sized>(value: &T) -> Result<String, Error>
pub fn to_string<T>(value: &T) -> Result<String, Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
let mut output = String::new();
let serializer = Serializer::new(&mut output);
Expand All @@ -63,9 +63,9 @@ where
/// For greater customization, instead serialize to a
/// [`toml_edit::DocumentMut`](https://docs.rs/toml_edit/latest/toml_edit/struct.DocumentMut.html).
#[cfg(feature = "display")]
pub fn to_string_pretty<T: ?Sized>(value: &T) -> Result<String, Error>
pub fn to_string_pretty<T>(value: &T) -> Result<String, Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
let mut output = String::new();
let serializer = Serializer::pretty(&mut output);
Expand Down Expand Up @@ -301,9 +301,9 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
)
}

fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_document(
self.dst,
Expand Down Expand Up @@ -345,13 +345,9 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
)
}

fn serialize_newtype_struct<T: ?Sized>(
self,
name: &'static str,
v: &T,
) -> Result<Self::Ok, Self::Error>
fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_document(
self.dst,
Expand All @@ -360,15 +356,15 @@ impl<'d> serde::ser::Serializer for Serializer<'d> {
)
}

fn serialize_newtype_variant<T: ?Sized>(
fn serialize_newtype_variant<T>(
self,
name: &'static str,
variant_index: u32,
variant: &'static str,
value: &T,
) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_document(
self.dst,
Expand Down Expand Up @@ -617,9 +613,9 @@ impl<'d> serde::ser::Serializer for ValueSerializer<'d> {
)
}

fn serialize_some<T: ?Sized>(self, v: &T) -> Result<Self::Ok, Self::Error>
fn serialize_some<T>(self, v: &T) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_value(
self.dst,
Expand Down Expand Up @@ -657,29 +653,25 @@ impl<'d> serde::ser::Serializer for ValueSerializer<'d> {
)
}

fn serialize_newtype_struct<T: ?Sized>(
self,
name: &'static str,
v: &T,
) -> Result<Self::Ok, Self::Error>
fn serialize_newtype_struct<T>(self, name: &'static str, v: &T) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_value(
self.dst,
toml_edit::ser::ValueSerializer::new().serialize_newtype_struct(name, v),
)
}

fn serialize_newtype_variant<T: ?Sized>(
fn serialize_newtype_variant<T>(
self,
name: &'static str,
variant_index: u32,
variant: &'static str,
value: &T,
) -> Result<Self::Ok, Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
write_value(
self.dst,
Expand Down Expand Up @@ -785,9 +777,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_element(value).map_err(Error::wrap)
}
Expand All @@ -801,9 +793,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_element(value).map_err(Error::wrap)
}
Expand All @@ -817,9 +809,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(value).map_err(Error::wrap)
}
Expand All @@ -833,9 +825,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(value).map_err(Error::wrap)
}
Expand Down Expand Up @@ -869,16 +861,16 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_key(input).map_err(Error::wrap)
}

fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_value(value).map_err(Error::wrap)
}
Expand All @@ -892,13 +884,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(
&mut self,
key: &'static str,
value: &T,
) -> Result<(), Self::Error>
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(key, value).map_err(Error::wrap)
}
Expand Down Expand Up @@ -954,9 +942,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_element(value).map_err(Error::wrap)
}
Expand All @@ -970,9 +958,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_element<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_element<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_element(value).map_err(Error::wrap)
}
Expand All @@ -986,9 +974,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(value).map_err(Error::wrap)
}
Expand All @@ -1002,9 +990,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(&mut self, value: &T) -> Result<(), Error>
fn serialize_field<T>(&mut self, value: &T) -> Result<(), Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(value).map_err(Error::wrap)
}
Expand Down Expand Up @@ -1036,16 +1024,16 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_key<T: ?Sized>(&mut self, input: &T) -> Result<(), Self::Error>
fn serialize_key<T>(&mut self, input: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_key(input).map_err(Error::wrap)
}

fn serialize_value<T: ?Sized>(&mut self, value: &T) -> Result<(), Self::Error>
fn serialize_value<T>(&mut self, value: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_value(value).map_err(Error::wrap)
}
Expand All @@ -1059,13 +1047,9 @@ mod internal {
type Ok = ();
type Error = Error;

fn serialize_field<T: ?Sized>(
&mut self,
key: &'static str,
value: &T,
) -> Result<(), Self::Error>
fn serialize_field<T>(&mut self, key: &'static str, value: &T) -> Result<(), Self::Error>
where
T: serde::ser::Serialize,
T: serde::ser::Serialize + ?Sized,
{
self.inner.serialize_field(key, value).map_err(Error::wrap)
}
Expand Down

0 comments on commit f8b1b26

Please sign in to comment.