Fix merge error
This commit is contained in:
parent
f79f122003
commit
ba38e0f98d
|
@ -291,7 +291,7 @@ impl AllOrSome<HashSet<Url>> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Response generator and [Fairing](https://rocket.rs/guide/fairings/) for CORS
|
/// A wrapper type around `rocket::http::Method` to support serialization and deserialization
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
|
#[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
|
||||||
pub struct Method(http::Method);
|
pub struct Method(http::Method);
|
||||||
|
|
||||||
|
@ -363,6 +363,7 @@ impl<'de> Deserialize<'de> for Method {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Response generator and [Fairing](https://rocket.rs/guide/fairings/) for CORS
|
||||||
///
|
///
|
||||||
/// This struct can be as Fairing or in an ad-hoc manner to generate CORS response.
|
/// This struct can be as Fairing or in an ad-hoc manner to generate CORS response.
|
||||||
///
|
///
|
||||||
|
|
Loading…
Reference in New Issue