Skip to content

Commit

Permalink
Run cargo clippy --all-targets --fix
Browse files Browse the repository at this point in the history
These lints where missed because the problems were inside tests.

Note that "targets" does not refer to OS/architectures.
```
> cargo build --help
...
Target Selection:
      --lib               Build only this package's library
      --bins              Build all binaries
      --bin [<NAME>]      Build only the specified binary
      --examples          Build all examples
      --example [<NAME>]  Build only the specified example
      --tests             Build all test targets
      --test [<NAME>]     Build only the specified test target
      --benches           Build all bench targets
      --bench [<NAME>]    Build only the specified bench target
      --all-targets       Build all targets
```
  • Loading branch information
Serock3 authored and dlon committed Jan 5, 2024
1 parent 616d064 commit 62df52b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions mullvad-daemon/src/migrations/v7.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ pub struct ShadowsocksProxySettings {
/// - shadowsocks.peer to shadowsocks.endpoint
/// - socks5_remote.authentication to socks5_remote.auth
/// - socks5_remote.peer to socks5_remote.endpoint
///
pub fn migrate(settings: &mut serde_json::Value) -> Result<()> {
if !version_matches(settings) {
return Ok(());
Expand Down Expand Up @@ -254,7 +253,6 @@ mod test {
use crate::migrations::v7::{migrate_api_access_settings, migrate_bridge_settings};

use super::{migrate, version_matches};
use serde_json;

pub const V7_SETTINGS: &str = r#"
{
Expand Down
2 changes: 1 addition & 1 deletion mullvad-daemon/src/settings/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ mod test {
);

assert!(
settings.block_when_disconnected == false,
!settings.block_when_disconnected,
"The daemon should not block the internet if settings are missing"
);
}
Expand Down

0 comments on commit 62df52b

Please sign in to comment.