Skip to content

Commit aa1f96f

Browse files
nricciardinricciardi
committed
Fixed some warnings
1 parent cbf13a9 commit aa1f96f

24 files changed

+51
-57
lines changed

‎Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "nmd"
33
version = "0.33.2"
44
authors = ["Nicola Ricciardi"]
55
edition = "2021"
6-
description = "Official NMD CLI"
6+
description = "Official NMD CLI and compiler"
77
readme = "README.md"
88
repository = "https://github.com/nricciardi/nmd"
99
license-file = "LICENSE"

‎src/cli.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
use std::collections::HashSet;
44
use std::{path::PathBuf, str::FromStr};
55

6-
use clap::builder::OsStr;
76
use clap::{Arg, ArgAction, ArgMatches, Command};
87
use crate::compiler::Compiler;
98
use crate::compiler::{output_format::OutputFormatError, CompilationError};

‎src/compiler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ impl Compiler {
212212

213213
let compilation_configuration = compilation_configuration.clone();
214214

215-
let thread_res = thread::spawn(|| {
215+
let _thread_res = thread::spawn(|| {
216216
let compilation_result = Self::compile_dossier(compilation_configuration);
217217

218218
match compilation_result {

‎src/compiler/assembler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::resource::ResourceError;
44

55
use self::{html_assembler::HtmlAssembler, assembler_configuration::AssemblerConfiguration};
66

7-
use super::{artifact::{Artifact, ArtifactError}, codex::Codex, dossier::{Document, Dossier}, output_format::OutputFormat, parsable::parsed_content_accessor::ParsedContentAccessor, parsing::parsing_error::ParsingError};
7+
use super::{artifact::{Artifact, ArtifactError}, dossier::{Document, Dossier}, output_format::OutputFormat, parsing::parsing_error::ParsingError};
88

99
pub mod html_assembler;
1010
pub mod assembler_configuration;

‎src/compiler/bibliography.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
pub mod bibliography_record;
22

3-
use std::{collections::{BTreeMap, HashMap}, sync::{Arc, RwLock}};
3+
use std::{collections::BTreeMap, sync::{Arc, RwLock}};
44

55
use bibliography_record::BibliographyRecord;
66
use getset::{Getters, Setters};
77

88
use crate::resource::resource_reference::{ResourceReference, ResourceReferenceError};
99

10-
use super::{codex::Codex, dossier::{self, document::chapter::heading::Heading, dossier_configuration::dossier_configuration_bibliography::DossierConfigurationBibliography, Dossier}, output_format::OutputFormat, parsable::Parsable, parser::Parser, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}};
10+
use super::{codex::Codex, dossier::dossier_configuration::dossier_configuration_bibliography::DossierConfigurationBibliography, output_format::OutputFormat, parsable::Parsable, parser::Parser, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}};
1111

1212

1313
pub const BIBLIOGRAPHY_FICTITIOUS_DOCUMENT: &str = "bibliography";
@@ -56,7 +56,7 @@ impl Bibliography {
5656
}
5757

5858
impl Parsable for Bibliography {
59-
fn standard_parse(&mut self, format: &OutputFormat, codex: Arc<Codex>, parsing_configuration: Arc<RwLock<ParsingConfiguration>>, parsing_configuration_overlay: Arc<Option<ParsingConfigurationOverLay>>) -> Result<(), ParsingError> {
59+
fn standard_parse(&mut self, _format: &OutputFormat, codex: Arc<Codex>, parsing_configuration: Arc<RwLock<ParsingConfiguration>>, parsing_configuration_overlay: Arc<Option<ParsingConfigurationOverLay>>) -> Result<(), ParsingError> {
6060

6161
log::info!("parsing bibliography...");
6262

‎src/compiler/codex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ mod test {
441441

442442
use std::sync::{Arc, RwLock};
443443

444-
use crate::compiler::{loader::Loader, parsable::Parsable, parser::Parser, parsing::{parsing_configuration::ParsingConfiguration, parsing_outcome::ParsingOutcome}};
444+
use crate::compiler::{loader::Loader, parser::Parser, parsing::parsing_configuration::ParsingConfiguration};
445445

446446
use super::*;
447447

‎src/compiler/compilation_configuration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{clone, collections::{HashMap, HashSet}, path::PathBuf};
1+
use std::{collections::HashSet, path::PathBuf};
22

33
use getset::{CopyGetters, Getters, MutGetters, Setters};
44

‎src/compiler/dossier.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
pub mod document;
22
pub mod dossier_configuration;
33

4-
use std::{borrow::{Borrow, BorrowMut}, path::PathBuf, sync::{Arc, RwLock}, time::Instant};
4+
use std::{sync::{Arc, RwLock}, time::Instant};
55

6-
use document::chapter::{self, heading::Heading};
6+
use document::chapter::heading::Heading;
77
pub use document::{Document, DocumentError};
88
use getset::{Getters, Setters};
9-
use rayon::{iter::{IntoParallelRefMutIterator, ParallelIterator}, slice::IterMut};
9+
use rayon::iter::{IntoParallelRefMutIterator, ParallelIterator};
1010
use thiserror::Error;
1111

12-
use crate::{compiler::table_of_contents::content_tree::{ContentTree, ContentTreeNode}, resource::ResourceError};
12+
use crate::resource::ResourceError;
1313

1414
use self::dossier_configuration::DossierConfiguration;
1515

16-
use super::{bibliography::Bibliography, codex::Codex, output_format::OutputFormat, parsable::Parsable, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_metadata::ParsingMetadata}, table_of_contents::TableOfContents};
16+
use super::{bibliography::Bibliography, codex::Codex, output_format::OutputFormat, parsable::Parsable, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError}, table_of_contents::TableOfContents};
1717

1818

1919
pub const ASSETS_DIR: &str = "assets";

‎src/compiler/loader.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
use std::borrow::Borrow;
21
use std::collections::HashSet;
3-
use std::{cmp, io};
2+
use std::io;
43
use std::path::PathBuf;
54
use std::str::FromStr;
65

76
use once_cell::sync::Lazy;
8-
use rayon::iter::{IndexedParallelIterator, IntoParallelIterator, IntoParallelRefIterator, ParallelBridge, ParallelIterator};
7+
use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIterator};
98
use rayon::slice::ParallelSliceMut;
109
use regex::Regex;
1110
use thiserror::Error;
@@ -137,7 +136,7 @@ impl Loader {
137136

138137
log::debug!("load chapter {:?}", chapter_borders[index]);
139138

140-
let start = chapter_borders[index].0;
139+
let _start = chapter_borders[index].0;
141140
let end = chapter_borders[index].1;
142141
let raw_content = &chapter_borders[index].2;
143142

‎src/compiler/parsable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::sync::{Arc, RwLock};
44

55
use crate::compiler::codex::Codex;
66

7-
use super::{output_format::OutputFormat, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_metadata::ParsingMetadata}};
7+
use super::{output_format::OutputFormat, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError}};
88

99

1010
pub trait Parsable {

‎src/compiler/parser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ impl Parser {
3232
}
3333

3434
/// Parse a text (string) using `Codex` rules and `ParsingConfiguration` options, excluding a set of modifiers
35-
pub fn parse_text_excluding_modifiers(codex: &Codex, content: &str, mut excluded_modifiers: ModifiersBucket,
36-
parsing_configuration: Arc<RwLock<ParsingConfiguration>>, parsing_configuration_overlay: Arc<Option<ParsingConfigurationOverLay>>) -> Result<ParsingOutcome, ParsingError> {
35+
pub fn parse_text_excluding_modifiers(codex: &Codex, content: &str, excluded_modifiers: ModifiersBucket,
36+
parsing_configuration: Arc<RwLock<ParsingConfiguration>>, _parsing_configuration_overlay: Arc<Option<ParsingConfigurationOverLay>>) -> Result<ParsingOutcome, ParsingError> {
3737

3838
log::debug!("start to parse content:\n{}\nexcluding: {:?}", content, excluded_modifiers);
3939

‎src/compiler/parsing/parsing_configuration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pub mod list_bullet_configuration_record;
22
pub mod parsing_configuration_overlay;
33

4-
use std::{collections::HashMap, ops::Add, path::PathBuf};
4+
use std::{collections::HashMap, path::PathBuf};
55

66
use getset::{CopyGetters, Getters, MutGetters, Setters};
77

‎src/compiler/parsing/parsing_rule/html_table_rule.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use build_html::TableRow as HtmlTableRow;
66
use once_cell::sync::Lazy;
77
use regex::Regex;
88

9-
use crate::{compiler::{codex::{modifier::{constants::IDENTIFIER_PATTERN, standard_paragraph_modifier::StandardParagraphModifier, standard_text_modifier::StandardTextModifier}, Codex}, parser::Parser, parsing::{parsing_configuration::ParsingConfiguration, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}}, resource::{resource_reference::ResourceReference, table::{self, Table, TableCell, TableCellAlignment}}};
9+
use crate::{compiler::{codex::{modifier::{constants::IDENTIFIER_PATTERN, standard_paragraph_modifier::StandardParagraphModifier}, Codex}, parser::Parser, parsing::{parsing_configuration::ParsingConfiguration, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}}, resource::{resource_reference::ResourceReference, table::{Table, TableCell, TableCellAlignment}}};
1010

1111
use super::ParsingRule;
1212

@@ -389,7 +389,7 @@ impl ParsingRule for HtmlTableRule {
389389
mod test {
390390
use std::sync::{Arc, RwLock};
391391

392-
use crate::compiler::{codex::{self, codex_configuration::CodexConfiguration, Codex}, parsing::{parsing_configuration::ParsingConfiguration, parsing_rule::ParsingRule}};
392+
use crate::compiler::{codex::{codex_configuration::CodexConfiguration, Codex}, parsing::{parsing_configuration::ParsingConfiguration, parsing_rule::ParsingRule}};
393393

394394
use super::HtmlTableRule;
395395

‎src/compiler/parsing/parsing_rule/reference_rule.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::{collections::HashMap, fmt::Debug, sync::{Arc, RwLock}};
1+
use std::{fmt::Debug, sync::{Arc, RwLock}};
22

33
use regex::{Captures, Regex};
44

@@ -33,7 +33,7 @@ impl ParsingRule for ReferenceRule {
3333
&self.search_pattern
3434
}
3535

36-
fn standard_parse(&self, content: &str, codex: &Codex, parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
36+
fn standard_parse(&self, content: &str, _codex: &Codex, parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
3737

3838
let parsed_content = self.search_pattern_regex.replace_all(content, |capture: &Captures| {
3939

‎src/compiler/parsing/parsing_rule/replacement_rule.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl Debug for ReplacementRule<String> {
105105
impl ParsingRule for ReplacementRule<String> {
106106

107107
/// Parse the content using internal search and replacement pattern
108-
fn standard_parse(&self, content: &str, codex: &Codex, parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
108+
fn standard_parse(&self, content: &str, _codex: &Codex, parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
109109

110110
log::debug!("parsing:\n{}\nusing '{}'->'{:?}' (newline fix: {}, id_at: {:?})", content, self.search_pattern(), self.replacer_parts, self.newline_fix_pattern.is_some(), self.reference_at);
111111

@@ -202,7 +202,7 @@ impl<F> ParsingRule for ReplacementRule<F>
202202
where F: 'static + Sync + Send + Fn(&Captures) -> String {
203203

204204
/// Parse the content using internal search and replacement pattern
205-
fn standard_parse(&self, content: &str, codex: &Codex, parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
205+
fn standard_parse(&self, content: &str, _codex: &Codex, _parsing_configuration: Arc<RwLock<ParsingConfiguration>>) -> Result<ParsingOutcome, ParsingError> {
206206

207207
log::debug!("parsing:\n{}\nusing '{}' (newline fix: {}, id_at: {:?})", content, self.search_pattern(), self.newline_fix_pattern.is_some(), self.reference_at);
208208

‎src/compiler/table_of_contents.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
pub mod content_tree;
22

33
use std::sync::{Arc, RwLock};
4-
5-
use content_tree::ContentTree;
64
use getset::{CopyGetters, Getters, Setters};
7-
8-
use crate::resource::resource_reference::ResourceReference;
9-
10-
use super::{codex::Codex, dossier::{self, document::chapter::heading::Heading, Dossier}, output_format::OutputFormat, parsable::Parsable, parser::Parser, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}};
5+
use super::{codex::Codex, dossier::document::chapter::heading::Heading, output_format::OutputFormat, parsable::Parsable, parser::Parser, parsing::{parsing_configuration::{parsing_configuration_overlay::ParsingConfigurationOverLay, ParsingConfiguration}, parsing_error::ParsingError, parsing_outcome::ParsingOutcome}};
116

127

138
pub const TOC_INDENTATION: &str = r#"<span class="toc-item-indentation"></span>"#;

‎src/compiler/table_of_contents/content_tree.rs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ impl<T: Clone> ContentTreeNode<T> {
5858
pub fn walk_depth_first(&self) -> Vec<T> {
5959
let mut contents: Vec<T> = Vec::new();
6060

61-
Self::walk_depth_first_rec(&self, &mut |node: &ContentTreeNode<T>, current_lv: usize| -> Result<(), Infallible> {
61+
Self::walk_depth_first_rec(&self, &mut |node: &ContentTreeNode<T>, _current_lv: usize| -> Result<(), Infallible> {
6262
contents.push(node.content().clone());
6363

6464
Ok(())
65-
}, 0);
65+
}, 0).unwrap();
6666

6767
contents
6868
}
@@ -77,14 +77,16 @@ impl<T: Clone> ContentTreeNode<T> {
7777

7878
for sub_node in node.sub_nodes() {
7979

80-
Self::walk_depth_first_rec(sub_node, f, current_lv + 1);
80+
Self::walk_depth_first_rec(sub_node, f, current_lv + 1)?;
8181
}
8282

8383
Ok(())
8484
}
8585

86-
pub fn walk_depth_first_applying<O, E>(&self, f: &mut dyn FnMut(&ContentTreeNode<T>, usize) -> Result<O, E>) {
87-
Self::walk_depth_first_rec(&self, f, 0);
86+
pub fn walk_depth_first_applying<O, E>(&self, f: &mut dyn FnMut(&ContentTreeNode<T>, usize) -> Result<O, E>) -> Result<(), E> {
87+
Self::walk_depth_first_rec(&self, f, 0)?;
88+
89+
Ok(())
8890
}
8991
}
9092

‎src/dossier_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{io, path::PathBuf};
22

33
use thiserror::Error;
44

5-
use crate::{compiler::{dossier::{dossier_configuration::{self, DossierConfiguration}, Dossier}, loader::Loader}, constants::{DOSSIER_CONFIGURATION_YAML_FILE_NAME, NMD_EXTENSION}, resource::ResourceError, utility::file_utility};
5+
use crate::{compiler::dossier::dossier_configuration::DossierConfiguration, constants::{DOSSIER_CONFIGURATION_YAML_FILE_NAME, NMD_EXTENSION}, resource::ResourceError, utility::file_utility};
66

77
use self::dossier_manager_configuration::DossierManagerConfiguration;
88

‎src/generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pub mod generator_configuration;
22

3-
use std::{collections::{HashMap, HashSet}, fs, path::PathBuf};
3+
use std::{collections::HashMap, fs, path::PathBuf};
44
use once_cell::sync::Lazy;
55
use regex::Regex;
66

‎src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
use std::sync::Arc;
2-
31
use nmd::cli::{NmdCli, NmdCliError};
42

53

‎src/resource/image_resource.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
1-
use std::{fs::File, io::{Cursor, Read}, path::PathBuf, str::FromStr};
1+
use std::{io::Cursor, path::PathBuf, str::FromStr};
22

33
use base64::{engine::general_purpose::STANDARD, Engine};
4-
use image::{codecs::jpeg, DynamicImage, ImageOutputFormat};
4+
use getset::{Getters, Setters};
5+
use image::{DynamicImage, ImageOutputFormat};
56
use oxipng::Options;
67

78
use super::ResourceError;
89
use image::io::Reader as ImageReader;
910

1011

1112
/// Image resource to manipulate images
13+
#[derive(Debug, Getters, Setters)]
1214
pub struct ImageResource {
15+
16+
#[getset(get = "pub", set = "pub")]
1317
src: PathBuf,
18+
19+
#[getset(get = "pub", set = "pub")]
1420
image: DynamicImage,
1521
}
1622

@@ -111,11 +117,11 @@ impl FromStr for ImageResource {
111117

112118
#[cfg(test)]
113119
mod test {
114-
use std::{fs::File, io::{Cursor, Read}, path::PathBuf};
120+
// use std::{fs::File, io::{Cursor, Read}, path::PathBuf};
115121

116-
use image::ImageOutputFormat;
122+
// use image::ImageOutputFormat;
117123

118-
use crate::resource::image_resource::ImageResource;
124+
// use crate::resource::image_resource::ImageResource;
119125

120126

121127
#[test]

‎src/resource/remote_resource.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl FromStr for RemoteResource {
3737
Ok(url) => Ok(Self {
3838
url
3939
}),
40-
Err(e) => Err(ResourceError::InvalidResourceVerbose(format!("{} is an invalid url", url)))
40+
Err(_) => Err(ResourceError::InvalidResourceVerbose(format!("{} is an invalid url", url)))
4141
}
4242

4343
}
@@ -46,11 +46,11 @@ impl FromStr for RemoteResource {
4646
impl Resource for RemoteResource {
4747
type LocationType = Url;
4848

49-
fn write(&mut self, content: &str) -> Result<(), super::ResourceError> {
49+
fn write(&mut self, _content: &str) -> Result<(), super::ResourceError> {
5050
todo!()
5151
}
5252

53-
fn append(&mut self, content: &str) -> Result<(), super::ResourceError> {
53+
fn append(&mut self, _content: &str) -> Result<(), super::ResourceError> {
5454
todo!()
5555
}
5656

‎src/resource/resource_reference.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
use std::str::FromStr;
2-
31
use getset::{Getters, Setters};
42
use once_cell::sync::Lazy;
53
use regex::Regex;
6-
use serde::de::value;
74
use thiserror::Error;
85

9-
use crate::{compiler::dossier::document, resource::remote_resource::RemoteResource, utility::file_utility};
6+
use crate::{resource::remote_resource::RemoteResource, utility::file_utility};
107

118
static OF_INTERNAL_RESOURCE_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new(r"(.*)?#(.*)").unwrap());
129

‎src/utility/file_utility.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ use std::fs::{self, File};
22
use std::io::{self, Read, Write};
33
use std::path::{Path, PathBuf};
44

5-
use clap::builder::OsStr;
6-
75

86
/// Return entirely file content
97
pub fn read_file_content(file_path_buf: &PathBuf) -> Result<String, io::Error> {

0 commit comments

Comments
 (0)