remove static end tree segment variant
This commit is contained in:
1 parent
a73873a571
commit
f4227c7311
2 files changed
+2
-23
No files matched your search
@@ -60,7 +60,7 @@ struct Layout {
|
|||||||
// // If the component is not specified, the component is assumed to be at the path of the route (in this case /pages/hello_world.rs or /pages/hello_world/index.rs)
|
// // If the component is not specified, the component is assumed to be at the path of the route (in this case /pages/hello_world.rs or /pages/hello_world/index.rs)
|
||||||
// #[route("/")]
|
// #[route("/")]
|
||||||
// // You can opt out of a parent Layout
|
// // You can opt out of a parent Layout
|
||||||
// #[layout(!Component)]
|
// #[layout(!root_dynamic_segment)]
|
||||||
// Route2 {
|
// Route2 {
|
||||||
// // implicitly adds
|
// // implicitly adds
|
||||||
// // root_dynamic_segment: ComponentProps,
|
// // root_dynamic_segment: ComponentProps,
|
||||||
|
|||||||
@@ -17,7 +17,6 @@ pub enum RouteTreeSegment<'a> {
|
|||||||
from_route: &'a Route,
|
from_route: &'a Route,
|
||||||
},
|
},
|
||||||
Dynamic(&'a Route),
|
Dynamic(&'a Route),
|
||||||
StaticEnd(&'a Route),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> RouteTreeSegment<'a> {
|
impl<'a> RouteTreeSegment<'a> {
|
||||||
@@ -62,12 +61,7 @@ impl<'a> RouteTreeSegment<'a> {
|
|||||||
}
|
}
|
||||||
// If there is no static segment, add the route to the dynamic routes
|
// If there is no static segment, add the route to the dynamic routes
|
||||||
None => {
|
None => {
|
||||||
// This route is entirely static
|
dyn_segments.push(RouteTreeSegment::Dynamic(route.route));
|
||||||
if route.route.route_segments.len() == route.static_segment_index {
|
|
||||||
static_segments.push(RouteTreeSegment::StaticEnd(route.route));
|
|
||||||
} else {
|
|
||||||
dyn_segments.push(RouteTreeSegment::Dynamic(route.route));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -175,21 +169,6 @@ impl<'a> RouteTreeSegment<'a> {
|
|||||||
&varient_parse_error,
|
&varient_parse_error,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Self::StaticEnd(route) => {
|
|
||||||
let varient_parse_error = route.error_ident();
|
|
||||||
let enum_varient = &route.route_name;
|
|
||||||
let construct_variant = route.construct(enum_name);
|
|
||||||
let parse_query = route.parse_query();
|
|
||||||
|
|
||||||
return_constructed(
|
|
||||||
true,
|
|
||||||
construct_variant,
|
|
||||||
&error_enum_name,
|
|
||||||
enum_varient,
|
|
||||||
&varient_parse_error,
|
|
||||||
parse_query,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user