diff options
| author | Fuwn <[email protected]> | 2022-04-25 01:23:45 -0700 |
|---|---|---|
| committer | Fuwn <[email protected]> | 2022-04-25 01:23:45 -0700 |
| commit | 3115efb09b02e423013488a78214dd14d3edda6a (patch) | |
| tree | 44143b6df731b7230c1bc138b6e66f48eb3448fb | |
| parent | refactor(router): move section timer to function (diff) | |
| download | locus-3115efb09b02e423013488a78214dd14d3edda6a.tar.xz locus-3115efb09b02e423013488a78214dd14d3edda6a.zip | |
refactor: clarify imports
| -rw-r--r-- | src/main.rs | 6 | ||||
| -rw-r--r-- | src/modules/multi_blog.rs | 2 | ||||
| -rw-r--r-- | src/modules/search.rs | 2 | ||||
| -rw-r--r-- | src/modules/sitemap.rs | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/main.rs b/src/main.rs index 82fd838..11da61c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,9 +40,7 @@ extern crate log; use std::{collections::HashMap, lazy::SyncLazy, sync::Mutex}; use pickledb::PickleDb; -use route::track_mount; use tokio::time::Instant; -use windmark::{Response, Router}; use yarte::Template; const SEARCH_SIZE: usize = 10; @@ -108,12 +106,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> { pretty_env_logger::init(); let mut time_mount = Instant::now(); - let mut router = Router::new(); + let mut router = windmark::Router::new(); router.set_private_key_file(".locus/locus_private.pem"); router.set_certificate_file(".locus/locus_public.pem"); router.set_error_handler(Box::new(|_| { - Response::NotFound(ERROR_HANDLER_RESPONSE.into()) + windmark::Response::NotFound(ERROR_HANDLER_RESPONSE.into()) })); router.set_fix_path(true); diff --git a/src/modules/multi_blog.rs b/src/modules/multi_blog.rs index 3278e13..4dda4b0 100644 --- a/src/modules/multi_blog.rs +++ b/src/modules/multi_blog.rs @@ -22,7 +22,7 @@ use std::{ io::Read, }; -use crate::{success, track_mount}; +use crate::{route::track_mount, success}; #[allow(clippy::too_many_lines)] pub fn module(router: &mut windmark::Router) { diff --git a/src/modules/search.rs b/src/modules/search.rs index 56828b0..b63923b 100644 --- a/src/modules/search.rs +++ b/src/modules/search.rs @@ -19,7 +19,7 @@ use crate::search::{INDEX, SCHEMA}; pub fn module(router: &mut windmark::Router) { - crate::track_mount( + crate::route::track_mount( router, "/search", "A search engine for this Gemini capsule", diff --git a/src/modules/sitemap.rs b/src/modules/sitemap.rs index 7e190aa..b0a29d2 100644 --- a/src/modules/sitemap.rs +++ b/src/modules/sitemap.rs @@ -17,7 +17,7 @@ // SPDX-License-Identifier: GPL-3.0-only pub fn module(router: &mut windmark::Router) { - crate::track_mount( + crate::route::track_mount( router, "/sitemap", "A map of all publicly available routes on this Gemini capsule", |