Skip to content

Commit

Permalink
Merge pull request #69 from jjcomer/master
Browse files Browse the repository at this point in the history
Fix clippy lints
  • Loading branch information
jjcomer authored May 5, 2022
2 parents 3b0b370 + d083e1b commit 14e02a2
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 9 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
- aarch64-apple-darwin
# Windows ARM is not currently working
# - aarch64-pc-windows-msvc
- aarch64-unknown-linux-musl
- x86_64-unknown-linux-musl
toolchain:
- stable
Expand Down Expand Up @@ -70,9 +69,6 @@ jobs:
# - target: aarch64-pc-windows-msvc
# os: windows-latest
# testable: false
- target: aarch64-unknown-linux-musl
os: ubuntu-latest
testable: true
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
testable: true
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
- aarch64-apple-darwin
# Windows ARM is not currently working
# - aarch64-pc-windows-msvc
- aarch64-unknown-linux-musl
- x86_64-unknown-linux-musl
# Testability according to cross
# https://github.com/rust-embedded/cross#supported-targets
Expand All @@ -56,8 +55,6 @@ jobs:
os: macos-latest
# - target: aarch64-pc-windows-msvc
# os: windows-latest
- target: aarch64-unknown-linux-musl
os: ubuntu-latest
- target: x86_64-unknown-linux-musl
os: ubuntu-latest
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 2 additions & 0 deletions src/app/fetch_actor.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::from_over_into)]

use crate::app::datadogstatsd::{CustomMetrics, DdMetrics};
use hogan::config::ConfigDir;
use riker::actors::*;
Expand Down
2 changes: 2 additions & 0 deletions src/app/head_actor.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#![allow(clippy::from_over_into)]

use anyhow::Result;
use futures::executor::block_on;
use futures::future::RemoteHandle;
Expand Down
1 change: 1 addition & 0 deletions src/app/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ fn create_error_response(e: anyhow::Error) -> HttpResponse {
}
}

#[allow(clippy::too_many_arguments)]
pub fn start_up_server(
common: AppCommon,
port: u16,
Expand Down
2 changes: 1 addition & 1 deletion src/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use url::Url;
pub fn ext_clone(url: &Url, path: &Path) -> Result<()> {
info!("Cloning {:?} to {:?}", url, path);
let mut clone = Command::new("git")
.args(&["clone", &url.to_string(), path.to_str().unwrap()])
.args(&["clone", url.as_ref(), path.to_str().unwrap()])
.spawn()?;
let result = clone.wait()?;
info!("Clone output {}", result);
Expand Down
2 changes: 1 addition & 1 deletion src/transform/helper_url_rm_path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ impl HelperDef for UrlRmPathHelper {
let url = if s.ends_with('/') {
&s[..s.len() - 1]
} else {
&s
s
};

match Url::parse(url) {
Expand Down

0 comments on commit 14e02a2

Please sign in to comment.