Skip to content

Commit

Permalink
🩹 zn: fix impl (Try)From for owning values
Browse files Browse the repository at this point in the history
  • Loading branch information
anphir committed Feb 9, 2024
1 parent d6a78c8 commit 8f219cb
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions zbus_names/src/bus_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ impl<'name> From<&BusName<'name>> for BusName<'name> {
}
}

impl TryFrom<OwnedValue> for BusName<'static> {
impl TryFrom<OwnedValue> for BusName<'_> {
type Error = Error;

fn try_from(value: OwnedValue) -> Result<Self> {
Expand All @@ -328,7 +328,7 @@ impl TryFrom<BusName<'static>> for OwnedValue {
}
}

impl From<OwnedUniqueName> for BusName<'static> {
impl From<OwnedUniqueName> for BusName<'_> {
fn from(name: OwnedUniqueName) -> Self {
BusName::Unique(name.into())
}
Expand All @@ -340,7 +340,7 @@ impl<'a> From<&'a OwnedUniqueName> for BusName<'a> {
}
}

impl From<OwnedWellKnownName> for BusName<'static> {
impl From<OwnedWellKnownName> for BusName<'_> {
fn from(name: OwnedWellKnownName) -> Self {
BusName::WellKnown(name.into())
}
Expand Down Expand Up @@ -405,7 +405,7 @@ impl Display for OwnedBusName {
}
}

impl From<OwnedBusName> for BusName<'static> {
impl From<OwnedBusName> for BusName<'_> {
fn from(name: OwnedBusName) -> Self {
name.into_inner()
}
Expand Down Expand Up @@ -458,7 +458,7 @@ impl TryFrom<Value<'static>> for OwnedBusName {
}
}

impl From<OwnedBusName> for Value<'static> {
impl From<OwnedBusName> for Value<'_> {
fn from(name: OwnedBusName) -> Self {
name.0.into()
}
Expand All @@ -480,7 +480,7 @@ impl TryFrom<OwnedBusName> for OwnedValue {
}
}

impl From<OwnedBusName> for Str<'static> {
impl From<OwnedBusName> for Str<'_> {
fn from(value: OwnedBusName) -> Self {
match value.0 {
BusName::Unique(name) => name.into(),
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/error_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ impl Borrow<str> for OwnedErrorName {
}
}

impl From<OwnedErrorName> for ErrorName<'static> {
impl From<OwnedErrorName> for ErrorName<'_> {
fn from(o: OwnedErrorName) -> Self {
o.into_inner()
}
Expand All @@ -295,7 +295,7 @@ impl From<ErrorName<'_>> for OwnedErrorName {
}
}

impl From<OwnedErrorName> for Str<'static> {
impl From<OwnedErrorName> for Str<'_> {
fn from(value: OwnedErrorName) -> Self {
value.into_inner().0
}
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/interface_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ impl Borrow<str> for OwnedInterfaceName {
}
}

impl From<OwnedInterfaceName> for InterfaceName<'static> {
impl From<OwnedInterfaceName> for InterfaceName<'_> {
fn from(o: OwnedInterfaceName) -> Self {
o.into_inner()
}
Expand All @@ -293,7 +293,7 @@ impl From<InterfaceName<'_>> for OwnedInterfaceName {
}
}

impl From<OwnedInterfaceName> for Str<'static> {
impl From<OwnedInterfaceName> for Str<'_> {
fn from(value: OwnedInterfaceName) -> Self {
value.into_inner().0
}
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/member_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ impl Borrow<str> for OwnedMemberName {
}
}

impl From<OwnedMemberName> for MemberName<'static> {
impl From<OwnedMemberName> for MemberName<'_> {
fn from(o: OwnedMemberName) -> Self {
o.into_inner()
}
Expand All @@ -271,7 +271,7 @@ impl From<MemberName<'_>> for OwnedMemberName {
}
}

impl From<OwnedMemberName> for Str<'static> {
impl From<OwnedMemberName> for Str<'_> {
fn from(value: OwnedMemberName) -> Self {
value.into_inner().0
}
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/property_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ impl Borrow<str> for OwnedPropertyName {
}
}

impl From<OwnedPropertyName> for PropertyName<'static> {
impl From<OwnedPropertyName> for PropertyName<'_> {
fn from(o: OwnedPropertyName) -> Self {
o.into_inner()
}
Expand All @@ -251,7 +251,7 @@ impl From<PropertyName<'_>> for OwnedPropertyName {
}
}

impl From<OwnedPropertyName> for Str<'static> {
impl From<OwnedPropertyName> for Str<'_> {
fn from(value: OwnedPropertyName) -> Self {
value.into_inner().0
}
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/unique_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ impl Borrow<str> for OwnedUniqueName {
}
}

impl From<OwnedUniqueName> for UniqueName<'static> {
impl From<OwnedUniqueName> for UniqueName<'_> {
fn from(o: OwnedUniqueName) -> Self {
o.into_inner()
}
Expand All @@ -294,7 +294,7 @@ impl_try_from! {
try_from: [&'s str, String, Arc<str>, Cow<'s, str>, Str<'s>],
}

impl From<OwnedUniqueName> for Str<'static> {
impl From<OwnedUniqueName> for Str<'_> {
fn from(value: OwnedUniqueName) -> Self {
value.into_inner().0
}
Expand Down
4 changes: 2 additions & 2 deletions zbus_names/src/well_known_name.rs
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ impl Display for OwnedWellKnownName {
}
}

impl From<OwnedWellKnownName> for WellKnownName<'static> {
impl From<OwnedWellKnownName> for WellKnownName<'_> {
fn from(name: OwnedWellKnownName) -> Self {
name.into_inner()
}
Expand All @@ -315,7 +315,7 @@ impl_try_from! {
try_from: [&'s str, String, Arc<str>, Cow<'s, str>, Str<'s>],
}

impl From<OwnedWellKnownName> for Str<'static> {
impl From<OwnedWellKnownName> for Str<'_> {
fn from(value: OwnedWellKnownName) -> Self {
value.into_inner().0
}
Expand Down

0 comments on commit 8f219cb

Please sign in to comment.