mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-11-04 04:08:20 +02:00 
			
		
		
		
	Use matches macro
				
					
				
			This commit is contained in:
		@@ -90,17 +90,11 @@ impl PartialOrd<i32> for UserOrgType {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn gt(&self, other: &i32) -> bool {
 | 
			
		||||
        match self.partial_cmp(other) {
 | 
			
		||||
            Some(Ordering::Less) | Some(Ordering::Equal) => false,
 | 
			
		||||
            _ => true,
 | 
			
		||||
        }
 | 
			
		||||
        !matches!(self.partial_cmp(other), Some(Ordering::Less) | Some(Ordering::Equal))
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn ge(&self, other: &i32) -> bool {
 | 
			
		||||
        match self.partial_cmp(other) {
 | 
			
		||||
            Some(Ordering::Less) => false,
 | 
			
		||||
            _ => true,
 | 
			
		||||
        }
 | 
			
		||||
        !matches!(self.partial_cmp(other), Some(Ordering::Less))
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -119,17 +113,11 @@ impl PartialOrd<UserOrgType> for i32 {
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn lt(&self, other: &UserOrgType) -> bool {
 | 
			
		||||
        match self.partial_cmp(other) {
 | 
			
		||||
            Some(Ordering::Less) | None => true,
 | 
			
		||||
            _ => false,
 | 
			
		||||
        }
 | 
			
		||||
        matches!(self.partial_cmp(other), Some(Ordering::Less) | None)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fn le(&self, other: &UserOrgType) -> bool {
 | 
			
		||||
        match self.partial_cmp(other) {
 | 
			
		||||
            Some(Ordering::Less) | Some(Ordering::Equal) | None => true,
 | 
			
		||||
            _ => false,
 | 
			
		||||
        }
 | 
			
		||||
        matches!(self.partial_cmp(other), Some(Ordering::Less) | Some(Ordering::Equal) | None)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -48,10 +48,7 @@ fn main() {
 | 
			
		||||
    let level = LF::from_str(&CONFIG.log_level()).expect("Valid log level");
 | 
			
		||||
    init_logging(level).ok();
 | 
			
		||||
 | 
			
		||||
    let extra_debug = match level {
 | 
			
		||||
        LF::Trace | LF::Debug => true,
 | 
			
		||||
        _ => false,
 | 
			
		||||
    };
 | 
			
		||||
    let extra_debug = matches!(level, LF::Trace | LF::Debug);
 | 
			
		||||
 | 
			
		||||
    check_data_folder();
 | 
			
		||||
    check_rsa_keys();
 | 
			
		||||
@@ -64,10 +61,10 @@ fn main() {
 | 
			
		||||
 | 
			
		||||
const HELP: &str = "\
 | 
			
		||||
        A Bitwarden API server written in Rust
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        USAGE:
 | 
			
		||||
            bitwarden_rs
 | 
			
		||||
        
 | 
			
		||||
 | 
			
		||||
        FLAGS:
 | 
			
		||||
            -h, --help       Prints help information
 | 
			
		||||
            -v, --version    Prints the app version
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user