diff --git a/packages/router-macro/src/nest.rs b/packages/router-macro/src/nest.rs index 80a2af058..9e37a2c42 100644 --- a/packages/router-macro/src/nest.rs +++ b/packages/router-macro/src/nest.rs @@ -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) // #[route("/")] // // You can opt out of a parent Layout -// #[layout(!Component)] +// #[layout(!root_dynamic_segment)] // Route2 { // // implicitly adds // // root_dynamic_segment: ComponentProps, diff --git a/packages/router-macro/src/route_tree.rs b/packages/router-macro/src/route_tree.rs index b2a0358f6..1a0fa1bdd 100644 --- a/packages/router-macro/src/route_tree.rs +++ b/packages/router-macro/src/route_tree.rs @@ -17,7 +17,6 @@ pub enum RouteTreeSegment<'a> { from_route: &'a Route, }, Dynamic(&'a Route), - StaticEnd(&'a Route), } 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 None => { - // This route is entirely static - 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)); - } + dyn_segments.push(RouteTreeSegment::Dynamic(route.route)); } } } @@ -175,21 +169,6 @@ impl<'a> RouteTreeSegment<'a> { &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, - ) - } } } }