diff --git a/server/src/bin/server.rs b/server/src/bin/server.rs index 6ee4d1b..55f4f8d 100644 --- a/server/src/bin/server.rs +++ b/server/src/bin/server.rs @@ -1,3 +1,6 @@ +// Rocket generates a lot of warnings for handlers +// TODO: figure out why +#![allow(unreachable_patterns)] #[macro_use] extern crate rocket; use std::{error::Error, io::Cursor, str::FromStr}; diff --git a/server/src/lib.rs b/server/src/lib.rs index 29315e9..639a77f 100644 --- a/server/src/lib.rs +++ b/server/src/lib.rs @@ -14,19 +14,16 @@ use lol_html::{ RewriteStrSettings, }; use maplit::{hashmap, hashset}; -use scraper::{error::SelectorErrorKind, Html, Selector}; +use scraper::{Html, Selector}; use thiserror::Error; use url::Url; -use crate::newsreader::{ - extract_thread_id, is_newsreader_search, is_newsreader_thread, make_news_tag, -}; -const NON_EXISTENT_SITE_NAME: &'static str = "NO-SUCH-SITE"; +use crate::newsreader::{extract_thread_id, is_newsreader_thread}; // TODO: figure out how to use Cow #[async_trait] trait Transformer: Send + Sync { - fn should_run(&self, addr: &Option, _html: &str) -> bool { + fn should_run(&self, _addr: &Option, _html: &str) -> bool { true } // TODO: should html be something like `html_escape` uses: @@ -138,7 +135,7 @@ struct FrameImages; #[async_trait] impl Transformer for FrameImages { - async fn transform(&self, link: &Option, html: &str) -> Result { + async fn transform(&self, _: &Option, html: &str) -> Result { Ok(rewrite_str( html, RewriteStrSettings { @@ -213,7 +210,7 @@ impl SlurpContents { #[async_trait] impl Transformer for SlurpContents { - fn should_run(&self, link: &Option, html: &str) -> bool { + fn should_run(&self, link: &Option, _: &str) -> bool { if let Some(link) = link { return self.get_selectors(link).is_some(); } @@ -580,7 +577,6 @@ impl FromStr for Query { let mut tag = None; let mut uid = None; let mut remainder = Vec::new(); - let site_prefix = make_news_tag(""); let mut is_notmuch = false; let mut is_newsreader = false; for word in s.split_whitespace() { diff --git a/server/src/newsreader.rs b/server/src/newsreader.rs index 3be5ff0..cafec74 100644 --- a/server/src/newsreader.rs +++ b/server/src/newsreader.rs @@ -14,7 +14,7 @@ const THREAD_PREFIX: &'static str = "news:"; use crate::{ compute_offset_limit, error::ServerError, - graphql::{Body, Email, Html, Message, NewsPost, Tag, Thread, ThreadSummary}, + graphql::{NewsPost, Tag, Thread, ThreadSummary}, AddOutlink, EscapeHtml, FrameImages, InlineStyle, SanitizeHtml, SlurpContents, StripHtml, Transformer, };