Merge pull request 'clippy' (#253) from staging into main
Reviewed-on: #253
This commit was merged in pull request #253.
	This commit is contained in:
		@@ -108,6 +108,12 @@ pub struct Fee {
 | 
			
		||||
    pub paid: bool,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Default for Fee {
 | 
			
		||||
    fn default() -> Self {
 | 
			
		||||
        Self::new()
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Fee {
 | 
			
		||||
    pub fn new() -> Self {
 | 
			
		||||
        Self {
 | 
			
		||||
@@ -790,18 +796,18 @@ impl<'r> FromRequest<'r> for AllowedForPlannedTripsUser {
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
impl Into<User> for AllowedForPlannedTripsUser {
 | 
			
		||||
    fn into(self) -> User {
 | 
			
		||||
        self.0
 | 
			
		||||
impl From<AllowedForPlannedTripsUser> for User {
 | 
			
		||||
    fn from(val: AllowedForPlannedTripsUser) -> Self {
 | 
			
		||||
        val.0
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#[derive(Debug, Serialize, Deserialize)]
 | 
			
		||||
pub struct DonauLinzUser(pub(crate) User);
 | 
			
		||||
 | 
			
		||||
impl Into<User> for DonauLinzUser {
 | 
			
		||||
    fn into(self) -> User {
 | 
			
		||||
        self.0
 | 
			
		||||
impl From<DonauLinzUser> for User {
 | 
			
		||||
    fn from(val: DonauLinzUser) -> Self {
 | 
			
		||||
        val.0
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -839,9 +845,9 @@ impl<'r> FromRequest<'r> for DonauLinzUser {
 | 
			
		||||
#[derive(Debug, Serialize, Deserialize)]
 | 
			
		||||
pub struct VorstandUser(pub(crate) User);
 | 
			
		||||
 | 
			
		||||
impl Into<User> for VorstandUser {
 | 
			
		||||
    fn into(self) -> User {
 | 
			
		||||
        self.0
 | 
			
		||||
impl From<VorstandUser> for User {
 | 
			
		||||
    fn from(val: VorstandUser) -> Self {
 | 
			
		||||
        val.0
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -876,9 +882,9 @@ impl<'r> FromRequest<'r> for VorstandUser {
 | 
			
		||||
#[derive(Debug, Serialize, Deserialize)]
 | 
			
		||||
pub struct PlannedEventUser(pub(crate) User);
 | 
			
		||||
 | 
			
		||||
impl Into<User> for PlannedEventUser {
 | 
			
		||||
    fn into(self) -> User {
 | 
			
		||||
        self.0
 | 
			
		||||
impl From<PlannedEventUser> for User {
 | 
			
		||||
    fn from(val: PlannedEventUser) -> Self {
 | 
			
		||||
        val.0
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -68,7 +68,7 @@ async fn list(db: &State<SqlitePool>, _admin: AdminUser, list_form: Form<ListFor
 | 
			
		||||
        result: names_not_in_acceptable_users
 | 
			
		||||
    };
 | 
			
		||||
 | 
			
		||||
    Template::render("admin/list/result", &context)
 | 
			
		||||
    Template::render("admin/list/result", context)
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
pub fn routes() -> Vec<Route> {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user