rwf2
/
Rocket
mirror of https://github.com/rwf2/Rocket.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up implementation, and prep for draft PR

This commit is contained in:
Matthew Pomes 2024-05-17 11:40:23 -05:00
parent 0d9a5ec694
commit 216f7943ce
No known key found for this signature in database
GPG Key ID: 0675E338E21621E2
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/lib/src/router/unique_property.rs
View File

@ -76,8 +76,10 @@ impl Sealed for Host<'static> {}
impl UniqueProperty for MediaType { impl UniqueProperty for MediaType {
fn collides(&self, self_route: &Route, other_route: &Route) -> Option<bool> { fn collides(&self, self_route: &Route, other_route: &Route) -> Option<bool> {
match (self_route.method.allows_request_body(), other_route.method.allows_request_body()) { match (self_route.method.allows_request_body(), other_route.method.allows_request_body()) {
(Some(true), Some(true)) => other_route.get_unique_prop().map(|other| self.collides_with(other)), (Some(true), Some(true)) => other_route
_ => Some(true), .get_unique_prop()
.map(|other| self.collides_with(other)),
_ => None, // Does not differentiate routes
} }
} }
@ -101,25 +103,15 @@ pub(crate) fn dyn_box_any(b: &Box<dyn UniqueProperty>) -> &dyn Any {
let any = b.as_any(); let any = b.as_any();
assert_eq!(b.type_id(), any.type_id()); assert_eq!(b.type_id(), any.type_id());
any any
// <Box<dyn UniqueProperty> as AsRef<dyn UniqueProperty>>::as_ref(b).as_any()
// todo!()
} }
/// A set of properties is unambiguous iff there is at least one property shared by both sets, with /// A set of properties is unambiguous iff there is at least one property shared by both sets, with
/// a different value. /// a different value.
pub(crate) fn collides(a: &Route, b: &Route) -> bool { pub(crate) fn collides(a: &Route, b: &Route) -> bool {
for prop_a in &a.unique_properties { for prop_a in &a.unique_properties {
for prop_b in &b.unique_properties { // TODO: we should consider checking the inverse, i.e., does b collide with a
// Check that they have the same type_id, which prevents checking other properties (and potentially if prop_a.collides(a, b) == Some(false) {
// avoids the need to check the reverse) return false;
dbg!((prop_a.type_id(), prop_b.type_id(), prop_a.type_id() == prop_b.type_id()));
dbg!(prop_a.collides(a, b));
// `prop_b.as_ref()` is needed to ensure we do not convert `Box<dyn _>` into `&dyn Any`, but rather
// get the inner type
// assert_eq!(std::any::TypeId::of::<MediaType>(), dyn_box_any(prop_b).type_id());
if dyn_box_any(prop_a).type_id() == dyn_box_any(prop_b).type_id() && prop_a.collides(a, b) == Some(false) {
return false;
}
} }
} }
true true