adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Update to edition 2018

Browse source
This commit is contained in:
Adrian Heine 2019-10-02 23:49:08 +02:00
parent bc4a898c0a
commit 602c7f7ebe
41 changed files with 188 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/symbols/user.rs
View file

@ -2,9 +2,9 @@ use std::borrow::Cow;
use std::error::Error;
use std::fmt;
use command_runner::CommandRunner;
use resources::Resource;
use symbols::{Action, OwnedSymbolAction, Symbol, SymbolAction, SymbolRunner};
use crate::command_runner::CommandRunner;
use crate::resources::Resource;
use crate::symbols::{Action, OwnedSymbolAction, Symbol, SymbolAction, SymbolRunner};
#[derive(Debug)]
pub enum UserAdderError {
@ -30,7 +30,7 @@ impl Error for UserAdderError {
}
impl fmt::Display for UserAdderError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.cause() {
Some(e) => write!(f, "{} (cause: {})", self.description(), e),
None => write!(f, "{}", self.description()),
@ -61,7 +61,7 @@ impl Error for UserError {
}
impl fmt::Display for UserError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self.cause() {
Some(e) => write!(f, "{} (cause: {})", self.description(), e),
None => write!(f, "{}", self.description()),
@ -86,7 +86,7 @@ impl<'a, C: CommandRunner, A: 'a + UserAdder> User<'a, C, A> {
}
impl<'a, C: CommandRunner, A: 'a + UserAdder> fmt::Display for User<'a, C, A> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "User {}", self.user_name)
}
}
@ -126,7 +126,7 @@ impl<'a, C: CommandRunner, A: 'a + UserAdder> Symbol for User<'a, C, A> {
}
}
pub struct SystemUserAdder<'a, C: 'a + CommandRunner> {
pub struct SystemUserAdder<'a, C: CommandRunner> {
command_runner: &'a C,
}
@ -171,11 +171,11 @@ mod test {
use std::error::Error;
use std::fmt;
use command_runner::StdCommandRunner;
use symbols::user::User;
use symbols::user::UserAdder;
use symbols::user::UserAdderError;
use symbols::Symbol;
use crate::command_runner::StdCommandRunner;
use crate::symbols::user::User;
use crate::symbols::user::UserAdder;
use crate::symbols::user::UserAdderError;
use crate::symbols::Symbol;
#[derive(Debug, PartialEq)]
struct DummyError;
@ -186,7 +186,7 @@ mod test {
}
impl fmt::Display for DummyError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "DummyError")
}
}