Skip to content

Commit 33bf4d3

Browse files
authored
fix merge race (#958)
1 parent f856450 commit 33bf4d3

1 file changed

Lines changed: 0 additions & 20 deletions

File tree

cargo-typify/tests/outputs/attr.rs

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,6 @@ impl ::std::convert::From<Fruit>
5959
value.0
6060
}
6161
}
62-
impl ::std::convert::From<&Fruit> for Fruit {
63-
fn from(value: &Fruit) -> Self {
64-
value.clone()
65-
}
66-
}
6762
impl ::std::convert::From<::std::collections::HashMap<::std::string::String, ::std::string::String>>
6863
for Fruit
6964
{
@@ -107,11 +102,6 @@ pub enum FruitOrVeg {
107102
Veg(Veggie),
108103
Fruit(Fruit),
109104
}
110-
impl ::std::convert::From<&Self> for FruitOrVeg {
111-
fn from(value: &FruitOrVeg) -> Self {
112-
value.clone()
113-
}
114-
}
115105
impl ::std::convert::From<Veggie> for FruitOrVeg {
116106
fn from(value: Veggie) -> Self {
117107
Self::Veg(value)
@@ -156,11 +146,6 @@ pub struct Veggie {
156146
#[serde(rename = "veggieName")]
157147
pub veggie_name: ::std::string::String,
158148
}
159-
impl ::std::convert::From<&Veggie> for Veggie {
160-
fn from(value: &Veggie) -> Self {
161-
value.clone()
162-
}
163-
}
164149
#[doc = "A representation of a person, company, organization, or place"]
165150
#[doc = r""]
166151
#[doc = r" <details><summary>JSON schema</summary>"]
@@ -196,11 +181,6 @@ pub struct Veggies {
196181
#[serde(default, skip_serializing_if = "::std::vec::Vec::is_empty")]
197182
pub vegetables: ::std::vec::Vec<Veggie>,
198183
}
199-
impl ::std::convert::From<&Veggies> for Veggies {
200-
fn from(value: &Veggies) -> Self {
201-
value.clone()
202-
}
203-
}
204184
impl ::std::default::Default for Veggies {
205185
fn default() -> Self {
206186
Self {

0 commit comments

Comments
 (0)