Skip to content

Commit 540b88d

Browse files
sypharsyphar
committed
new router paths
1 parent fffe3e1 commit 540b88d

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎src/web/routes.rs‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ pub(super) fn build_axum_routes() -> AxumRouter {
108108
// have to use the same name:
109109
//
110110
// These routes work together:
111-
// - `/:name/:version/settings.html`
112-
// - `/:name/:version/:target`
111+
// - `/{name}/{version}/settings.html`
112+
// - `/{name}/{version}/{target}`
113113
// and axum can prioritize the more specific route.
114114
//
115115
// This panics because of conflicting routes:
116-
// - `/:name/:version/settings.html`
117-
// - `/:crate/:version/:target`
116+
// - `/{name}/{version}/settings.html`
117+
// - `/:crate/{version}/{target}`
118118
//
119119
AxumRouter::new()
120120
// Well known resources, robots.txt and favicon.ico support redirection, the sitemap.xml
@@ -139,7 +139,7 @@ pub(super) fn build_axum_routes() -> AxumRouter {
139139
get_internal(super::sitemap::sitemapindex_handler),
140140
)
141141
.route_with_tsr(
142-
"/-/sitemap/:letter/sitemap.xml",
142+
"/-/sitemap/{letter}/sitemap.xml",
143143
get_internal(super::sitemap::sitemap_handler),
144144
)
145145
.route_with_tsr(
@@ -149,7 +149,7 @@ pub(super) fn build_axum_routes() -> AxumRouter {
149149
.merge(build_metric_routes())
150150
.route_with_tsr("/about", get_internal(super::sitemap::about_handler))
151151
.route_with_tsr(
152-
"/about/:subpage",
152+
"/about/{subpage}",
153153
get_internal(super::sitemap::about_handler),
154154
)
155155
.route("/", get_internal(super::releases::home_page))
@@ -158,51 +158,51 @@ pub(super) fn build_axum_routes() -> AxumRouter {
158158
get_internal(super::releases::recent_releases_handler),
159159
)
160160
.route_with_tsr(
161-
"/releases/recent/:page",
161+
"/releases/recent/{page}",
162162
get_internal(super::releases::recent_releases_handler),
163163
)
164164
.route_with_tsr(
165165
"/releases/stars",
166166
get_internal(super::releases::releases_by_stars_handler),
167167
)
168168
.route_with_tsr(
169-
"/releases/stars/:page",
169+
"/releases/stars/{page}",
170170
get_internal(super::releases::releases_by_stars_handler),
171171
)
172172
.route_with_tsr(
173173
"/releases/recent-failures",
174174
get_internal(super::releases::releases_recent_failures_handler),
175175
)
176176
.route_with_tsr(
177-
"/releases/recent-failures/:page",
177+
"/releases/recent-failures/{page}",
178178
get_internal(super::releases::releases_recent_failures_handler),
179179
)
180180
.route_with_tsr(
181181
"/releases/failures",
182182
get_internal(super::releases::releases_failures_by_stars_handler),
183183
)
184184
.route_with_tsr(
185-
"/releases/failures/:page",
185+
"/releases/failures/{page}",
186186
get_internal(super::releases::releases_failures_by_stars_handler),
187187
)
188188
.route_with_tsr(
189-
"/crate/:name",
189+
"/crate/{name}",
190190
get_internal(super::crate_details::crate_details_handler),
191191
)
192192
.route_with_tsr(
193-
"/crate/:name/:version",
193+
"/crate/{name}/{version}",
194194
get_internal(super::crate_details::crate_details_handler),
195195
)
196196
.route_with_tsr(
197197
"/releases/feed",
198198
get_internal(super::releases::releases_feed_handler),
199199
)
200200
.route_with_tsr(
201-
"/releases/:owner",
201+
"/releases/{owner}",
202202
get_internal(super::releases::owner_handler),
203203
)
204204
.route_with_tsr(
205-
"/releases/:owner/:page",
205+
"/releases/{owner}/{page}",
206206
get_internal(super::releases::owner_handler),
207207
)
208208
.route_with_tsr(
@@ -218,71 +218,71 @@ pub(super) fn build_axum_routes() -> AxumRouter {
218218
get_internal(super::releases::build_queue_handler),
219219
)
220220
.route_with_tsr(
221-
"/crate/:name/:version/builds",
221+
"/crate/{name}/{version}/builds",
222222
get_internal(super::builds::build_list_handler),
223223
)
224224
.route(
225-
"/crate/:name/:version/builds.json",
225+
"/crate/{name}/{version}/builds.json",
226226
get_internal(super::builds::build_list_json_handler),
227227
)
228228
.route(
229-
"/crate/:name/:version/rebuild",
229+
"/crate/{name}/{version}/rebuild",
230230
post_internal(super::builds::build_trigger_rebuild_handler),
231231
)
232232
.route(
233-
"/crate/:name/:version/status.json",
233+
"/crate/{name}/{version}/status.json",
234234
get_internal(super::status::status_handler),
235235
)
236236
.route_with_tsr(
237-
"/crate/:name/:version/builds/:id",
237+
"/crate/{name}/{version}/builds/{id}",
238238
get_internal(super::build_details::build_details_handler),
239239
)
240240
.route_with_tsr(
241-
"/crate/:name/:version/builds/:id/:filename",
241+
"/crate/{name}/{version}/builds/{id}/{filename}",
242242
get_internal(super::build_details::build_details_handler),
243243
)
244244
.route_with_tsr(
245-
"/crate/:name/:version/features",
245+
"/crate/{name}/{version}/features",
246246
get_internal(super::features::build_features_handler),
247247
)
248248
.route_with_tsr(
249-
"/crate/:name/:version/source/",
249+
"/crate/{name}/{version}/source/",
250250
get_internal(super::source::source_browser_handler),
251251
)
252252
.route(
253-
"/crate/:name/:version/source/*path",
253+
"/crate/{name}/{version}/source/{*path}",
254254
get_internal(super::source::source_browser_handler),
255255
)
256256
.route(
257-
"/crate/:name/:version/menus/platforms/:target",
257+
"/crate/{name}/{version}/menus/platforms/{target}",
258258
get_internal(super::crate_details::get_all_platforms),
259259
)
260260
.route(
261-
"/crate/:name/:version/menus/platforms/:target/*path",
261+
"/crate/{name}/{version}/menus/platforms/{target}/{*path}",
262262
get_internal(super::crate_details::get_all_platforms),
263263
)
264264
.route(
265-
"/crate/:name/:version/menus/platforms",
265+
"/crate/{name}/{version}/menus/platforms",
266266
get_internal(super::crate_details::get_all_platforms_root),
267267
)
268268
.route(
269-
"/crate/:name/:version/menus/releases/:target",
269+
"/crate/{name}/{version}/menus/releases/{target}",
270270
get_internal(super::crate_details::get_all_releases),
271271
)
272272
.route(
273-
"/crate/:name/:version/menus/releases/:target/*path",
273+
"/crate/{name}/{version}/menus/releases/{target}/{*path}",
274274
get_internal(super::crate_details::get_all_releases),
275275
)
276276
.route(
277-
"/crate/:name/:version/menus/releases",
277+
"/crate/{name}/{version}/menus/releases",
278278
get_internal(super::crate_details::get_all_releases),
279279
)
280280
.route(
281-
"/crate/:name/:version/menus/releases/:target/",
281+
"/crate/{name}/{version}/menus/releases/{target}/",
282282
get_internal(super::crate_details::get_all_releases),
283283
)
284284
.route(
285-
"/-/rustdoc.static/*path",
285+
"/-/rustdoc.static/{*path}",
286286
get_internal(super::rustdoc::static_asset_handler),
287287
)
288288
.route(
@@ -304,59 +304,59 @@ pub(super) fn build_axum_routes() -> AxumRouter {
304304
}),
305305
)
306306
.route_with_tsr(
307-
"/crate/:name/:version/download",
307+
"/crate/{name}/{version}/download",
308308
get_internal(super::rustdoc::download_handler),
309309
)
310310
.route(
311-
"/crate/:name/:version/target-redirect/*path",
311+
"/crate/{name}/{version}/target-redirect/{*path}",
312312
get_internal(super::rustdoc::target_redirect_handler),
313313
)
314314
.route(
315-
"/:name/badge.svg",
315+
"/{name}/badge.svg",
316316
get_internal(super::rustdoc::badge_handler),
317317
)
318318
.route(
319-
"/:name",
319+
"/{name}",
320320
get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
321321
)
322322
.route(
323-
"/:name/",
323+
"/{name}/",
324324
get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
325325
)
326326
.route(
327-
"/:name/:version",
327+
"/{name}/{version}",
328328
get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
329329
)
330330
.route(
331-
"/:name/:version/",
331+
"/{name}/{version}/",
332332
get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
333333
)
334334
.route(
335-
"/:name/:version/all.html",
335+
"/{name}/{version}/all.html",
336336
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
337337
)
338338
.route(
339-
"/:name/:version/help.html",
339+
"/{name}/{version}/help.html",
340340
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
341341
)
342342
.route(
343-
"/:name/:version/settings.html",
343+
"/{name}/{version}/settings.html",
344344
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
345345
)
346346
.route(
347-
"/:name/:version/scrape-examples-help.html",
347+
"/{name}/{version}/scrape-examples-help.html",
348348
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
349349
)
350350
.route(
351-
"/:name/:version/:target",
351+
"/{name}/{version}/{target}",
352352
get_rustdoc(super::rustdoc::rustdoc_redirector_handler),
353353
)
354354
.route(
355-
"/:name/:version/:target/",
355+
"/{name}/{version}/{target}/",
356356
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
357357
)
358358
.route(
359-
"/:name/:version/:target/*path",
359+
"/{name}/{version}/{target}/{*path}",
360360
get_rustdoc(super::rustdoc::rustdoc_html_server_handler),
361361
)
362362
.fallback(fallback)

0 commit comments

Comments
 (0)