cleaned up code, using &str instead of RawStr

Signed-off-by: Gunwant Jain <mail@wantguns.dev>
This commit is contained in:
Gunwant Jain
2021-07-08 18:48:19 +05:30
parent 78d046afbd
commit e77c1a57e4
2 changed files with 20 additions and 3 deletions

View File

@@ -1,7 +1,6 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::fmt; use std::fmt;
use rocket::http::RawStr;
use rocket::request::FromParam; use rocket::request::FromParam;
use rand::{self, distributions::Alphanumeric, Rng}; use rand::{self, distributions::Alphanumeric, Rng};
@@ -25,9 +24,9 @@ impl<'a> PasteId<'a> {
} }
impl<'a> FromParam<'a> for PasteId<'a> { impl<'a> FromParam<'a> for PasteId<'a> {
type Error = &'a RawStr; type Error = &'a str;
fn from_param(param: &'a RawStr) -> Result<Self, Self::Error> { fn from_param(param: &'a str) -> Result<Self, Self::Error> {
match valid_id(param) { match valid_id(param) {
true => Ok(PasteId(Cow::Borrowed(param))), true => Ok(PasteId(Cow::Borrowed(param))),
false => Err(param), false => Err(param),

18
src/pretty.rs Normal file
View File

@@ -0,0 +1,18 @@
use std::fs;
use syntect::highlighting::ThemeSet;
use syntect::html::highlighted_html_for_string;
use syntect::parsing::SyntaxSet;
pub fn get_pretty_body(path: &String, ext: &String) -> String {
let ss = SyntaxSet::load_defaults_newlines();
let theme = ThemeSet::get_theme("themes/ayu_dark.tmTheme").unwrap();
let content = fs::read_to_string(path).unwrap();
let syntax = ss
.find_syntax_by_token(ext)
.unwrap_or_else(|| ss.find_syntax_plain_text());
let html = highlighted_html_for_string(&content, &ss, syntax, &theme);
html
}