Mercurial > lbo > hg > analyrics
changeset 27:792eb8ac3d93
cargo fmt
author | Lewin Bormann <lbo@spheniscida.de> |
---|---|
date | Thu, 14 Jul 2022 20:35:35 -0700 |
parents | b1850e6f4d9a |
children | 25439f8c9114 |
files | src/configdb.rs src/db.rs src/guards.rs src/logsdb.rs src/main.rs |
diffstat | 5 files changed, 5 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/configdb.rs Thu Jul 14 20:35:14 2022 -0700 +++ b/src/configdb.rs Thu Jul 14 20:35:35 2022 -0700 @@ -1,5 +1,4 @@ - -use crate::db::{PoolType, DBType}; +use crate::db::{DBType, PoolType}; use anyhow::Error; use log::{debug, error, info, warn, Level}; @@ -56,4 +55,3 @@ Ok(UserRecord::from_row(&entry)?) } } -
--- a/src/db.rs Thu Jul 14 20:35:14 2022 -0700 +++ b/src/db.rs Thu Jul 14 20:35:35 2022 -0700 @@ -1,4 +1,3 @@ - use rocket_db_pools::sqlx::{Executor, Row}; use rocket_db_pools::{Connection, Database, Pool}; use sqlx::prelude::FromRow;
--- a/src/guards.rs Thu Jul 14 20:35:14 2022 -0700 +++ b/src/guards.rs Thu Jul 14 20:35:35 2022 -0700 @@ -1,7 +1,6 @@ - use anyhow::{self, Context, Error}; -use rocket::http::{HeaderMap}; +use rocket::http::HeaderMap; use rocket::request::{self, FlashMessage, FromRequest, Outcome, Request}; pub const USER_ID_COOKIE_KEY: &str = "user_id"; @@ -32,4 +31,3 @@ Outcome::Success(HeadersGuard(req.headers().clone())) } } -
--- a/src/logsdb.rs Thu Jul 14 20:35:14 2022 -0700 +++ b/src/logsdb.rs Thu Jul 14 20:35:35 2022 -0700 @@ -1,5 +1,4 @@ - -use crate::db::{PoolType, DBType}; +use crate::db::{DBType, PoolType}; use anyhow::{Context, Error}; use log::{debug, error, info, warn, Level}; @@ -10,7 +9,6 @@ use rocket_db_pools::{Connection, Database, Pool}; use sqlx::prelude::FromRow; - #[derive(Database)] #[database("sqlite_logs")] pub struct LogsDB(pub PoolType); @@ -140,4 +138,3 @@ Ok((dates, visits, sessions)) } } -
--- a/src/main.rs Thu Jul 14 20:35:14 2022 -0700 +++ b/src/main.rs Thu Jul 14 20:35:35 2022 -0700 @@ -1,12 +1,11 @@ - +mod configdb; mod db; -mod configdb; mod logsdb; mod guards; use crate::configdb::{ConfigDB, ConfigDBSession}; -use crate::guards::{USER_ID_COOKIE_KEY, HeadersGuard, LoggedInGuard}; +use crate::guards::{HeadersGuard, LoggedInGuard, USER_ID_COOKIE_KEY}; use crate::logsdb::{LogsDB, LogsDBSession}; use anyhow::{self, Context, Error}; @@ -34,7 +33,6 @@ use std::path::{Path, PathBuf}; use std::time::Instant; - #[derive(Responder)] enum LoginResponse { // use templates later.