matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

[Auto] lib/entry/markdown: Fix Clippy warnings

Browse source 
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
flip1995 2019-08-27 10:50:19 +02:00 committed by Matthias Beyer
parent e2b1ed729a
commit 3215c6351c
3 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/entry/libimagentrymarkdown/src/html.rs
View file

@ -52,7 +52,7 @@ pub mod iter {
impl<I: Iterator<Item = Entry>> ToHtmlIterator<I> { impl<I: Iterator<Item = Entry>> ToHtmlIterator<I> {
pub fn new(i: I) -> ToHtmlIterator<I> { pub fn new(i: I) -> ToHtmlIterator<I> {
ToHtmlIterator { i: i } ToHtmlIterator { i }
} }
} }
@ -83,7 +83,7 @@ pub mod iter {
impl<I: Iterator<Item = Entry>> WithHtmlIterator<I> { impl<I: Iterator<Item = Entry>> WithHtmlIterator<I> {
pub fn new(i: I) -> WithHtmlIterator<I> { pub fn new(i: I) -> WithHtmlIterator<I> {
WithHtmlIterator { i: i } WithHtmlIterator { i }
} }
} }

4
lib/entry/libimagentrymarkdown/src/link.rs
View file

@ -38,7 +38,7 @@ impl Link {
/// Translate a `Link` into a `UrlLink` /// Translate a `Link` into a `UrlLink`
pub fn into_urllink(self) -> Result<UrlLink> { pub fn into_urllink(self) -> Result<UrlLink> {
Url::parse(&self.link[..]) Url::parse(&self.link[..])
.map(move |link| UrlLink { title: self.title, link: link, }) .map(move |link| UrlLink { title: self.title, link, })
.context(err_msg("Link parsing error")) .context(err_msg("Link parsing error"))
.map_err(Error::from) .map_err(Error::from)
} }
@ -85,7 +85,7 @@ impl Render for LinkExtractor {
match (link, content) { match (link, content) {
(Some(link), Some(content)) => { (Some(link), Some(content)) => {
self.links.push(Link { link: link, title: content }); self.links.push(Link { link, title: content });
false false
}, },

38
lib/entry/libimagentrymarkdown/src/processor.rs
View file

@ -148,10 +148,10 @@ impl LinkProcessor {
store.retrieve(id)? store.retrieve(id)?
} else { } else {
store.get(id.clone())? store.get(id.clone())?
.ok_or_else(|| Error::from(format_err!("Store get error: {}", id)))? .ok_or_else(|| format_err!("Store get error: {}", id))?
}; };
let _ = entry.add_link(&mut target)?; entry.add_link(&mut target)?;
}, },
LinkQualification::ExternalLink(url) => { LinkQualification::ExternalLink(url) => {
if !self.process_urls { if !self.process_urls {
@ -212,7 +212,7 @@ impl LinkProcessor {
trace!("Ready processing, linking new ref entry..."); trace!("Ready processing, linking new ref entry...");
let _ = entry.add_link(&mut ref_entry)?; entry.add_link(&mut ref_entry)?;
}, },
LinkQualification::Undecidable(e) => { LinkQualification::Undecidable(e) => {
// error // error
@ -250,7 +250,7 @@ impl LinkQualification {
// url::Url::parse() as Err(_) // url::Url::parse() as Err(_)
// //
// if url.scheme() == "https" || url.scheme() == "http" { // if url.scheme() == "https" || url.scheme() == "http" {
return LinkQualification::ExternalLink(url); LinkQualification::ExternalLink(url)
// } // }
}, },
@ -302,7 +302,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-1")).unwrap(); let mut base = store.create(PathBuf::from("test-1")).unwrap();
*base.get_content_mut() = format!("This is an example entry with no links"); *base.get_content_mut() = "This is an example entry with no links".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -319,7 +319,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-2.1")).unwrap(); let mut base = store.create(PathBuf::from("test-2.1")).unwrap();
*base.get_content_mut() = format!("This is an example entry with one [link](test-2.2)"); *base.get_content_mut() = "This is an example entry with one [link](test-2.2)".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -362,7 +362,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-2.1")).unwrap(); let mut base = store.create(PathBuf::from("test-2.1")).unwrap();
*base.get_content_mut() = format!("This is an example entry with one [link](/test-2.2)"); *base.get_content_mut() = "This is an example entry with one [link](/test-2.2)".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -383,7 +383,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-2.1")).unwrap(); let mut base = store.create(PathBuf::from("test-2.1")).unwrap();
*base.get_content_mut() = format!("This is an example entry with one [link](test-2.2)"); *base.get_content_mut() = "This is an example entry with one [link](test-2.2)".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -423,7 +423,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-5.1")).unwrap(); let mut base = store.create(PathBuf::from("test-5.1")).unwrap();
*base.get_content_mut() = format!("An [example](http://example.com) is here."); *base.get_content_mut() = "An [example](http://example.com) is here.".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -473,7 +473,7 @@ mod tests {
let mut base = store.create(PathBuf::from("test-5.1")).unwrap(); let mut base = store.create(PathBuf::from("test-5.1")).unwrap();
// As the ref target must exist, we're using /etc/hosts here // As the ref target must exist, we're using /etc/hosts here
*base.get_content_mut() = format!("An [example ref](file:///etc/hosts) is here."); *base.get_content_mut() = "An [example ref](file:///etc/hosts) is here.".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -503,10 +503,8 @@ mod tests {
let mut base = store.create(PathBuf::from("test-5.1")).unwrap(); let mut base = store.create(PathBuf::from("test-5.1")).unwrap();
// As the ref target must exist, we're using /etc/hosts here // As the ref target must exist, we're using /etc/hosts here
*base.get_content_mut() = format!( *base.get_content_mut() = r#"An [example ref](file:///etc/hosts)
r#"An [example ref](file:///etc/hosts) is [here](file:///etc/group)."#.to_string();
is [here](file:///etc/group)."#
);
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -536,10 +534,8 @@ mod tests {
let mut base = store.create(PathBuf::from("test-5.1")).unwrap(); let mut base = store.create(PathBuf::from("test-5.1")).unwrap();
// As the ref target must exist, we're using /etc/hosts here // As the ref target must exist, we're using /etc/hosts here
*base.get_content_mut() = format!( *base.get_content_mut() = r#"An [example ref](file:///etc/hosts)
r#"An [example ref](file:///etc/hosts) is [here](file:///etc/group)."#.to_string();
is [here](file:///etc/group)."#
);
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -567,7 +563,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-5.1")).unwrap(); let mut base = store.create(PathBuf::from("test-5.1")).unwrap();
*base.get_content_mut() = format!("An [example](http://example.com) is here."); *base.get_content_mut() = "An [example](http://example.com) is here.".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -594,7 +590,7 @@ mod tests {
let store = get_store(); let store = get_store();
let mut base = store.create(PathBuf::from("test-2.1")).unwrap(); let mut base = store.create(PathBuf::from("test-2.1")).unwrap();
*base.get_content_mut() = format!("This is an example entry with one [link](test-2.2)"); *base.get_content_mut() = "This is an example entry with one [link](test-2.2)".to_string();
let update = store.update(&mut base); let update = store.update(&mut base);
assert!(update.is_ok()); assert!(update.is_ok());
@ -611,7 +607,7 @@ mod tests {
let result = processor.process(&mut base, &store); let result = processor.process(&mut base, &store);
assert!(result.is_ok(), "Should be Ok(()): {:?}", result); assert!(result.is_ok(), "Should be Ok(()): {:?}", result);
assert_eq!(2, store.entries().unwrap().collect::<Vec<_>>().len()); assert_eq!(2, store.entries().unwrap().count());
} }
} }