diff --git a/.gitignore b/.gitignore index 52e73910..cb511c40 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,9 @@ npm-debug.log # Intellij IDEA .idea +# VS Code +.vscode + # ElixirLS .elixir_ls diff --git a/native/philomena/src/lib.rs b/native/philomena/src/lib.rs index ada6eb4b..f5317aa3 100644 --- a/native/philomena/src/lib.rs +++ b/native/philomena/src/lib.rs @@ -15,12 +15,12 @@ rustler::init! { // Markdown NIF wrappers. #[rustler::nif(schedule = "DirtyCpu")] -fn markdown_to_html<'a>(input: String, reps: Term<'a>) -> String { +fn markdown_to_html(input: String, reps: Term) -> String { markdown::to_html(input, reps) } #[rustler::nif(schedule = "DirtyCpu")] -fn markdown_to_html_unsafe<'a>(input: String, reps: Term<'a>) -> String { +fn markdown_to_html_unsafe(input: String, reps: Term) -> String { markdown::to_html_unsafe(input, reps) } diff --git a/native/philomena/src/markdown.rs b/native/philomena/src/markdown.rs index 2bbbb75b..af976233 100644 --- a/native/philomena/src/markdown.rs +++ b/native/philomena/src/markdown.rs @@ -18,14 +18,14 @@ fn common_options() -> ComrakOptions { options.extension.camoifier = Some(|s| camo::image_url(s).unwrap_or_else(|| String::from(""))); - if let Some(domains) = env::var("SITE_DOMAINS").ok() { - options.extension.philomena_domains = Some(domains.split(",").map(|s| s.to_string()).collect::>()); - }; + if let Ok(domains) = env::var("SITE_DOMAINS") { + options.extension.philomena_domains = Some(domains.split(',').map(|s| s.to_string()).collect::>()); + } options } -fn map_to_hashmap<'a>(map: Term<'a>) -> Option> { +fn map_to_hashmap(map: Term) -> Option> { Some(MapIterator::new(map)?.map(|(key, value)| { let key: String = key.decode().unwrap_or_else(|_| String::from("")); let value: String = value.decode().unwrap_or_else(|_| String::from("")); @@ -34,7 +34,7 @@ fn map_to_hashmap<'a>(map: Term<'a>) -> Option> { }).collect()) } -pub fn to_html<'a>(input: String, reps: Term<'a>) -> String { +pub fn to_html(input: String, reps: Term) -> String { let mut options = common_options(); options.render.escape = true; @@ -43,7 +43,7 @@ pub fn to_html<'a>(input: String, reps: Term<'a>) -> String { comrak::markdown_to_html(&input, &options) } -pub fn to_html_unsafe<'a>(input: String, reps: Term<'a>) -> String { +pub fn to_html_unsafe(input: String, reps: Term) -> String { let mut options = common_options(); options.render.unsafe_ = true;