Skip to content

Commit

Permalink
Fix clippy warnings with recent versions of clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
glandium committed Jan 15, 2021
1 parent f9f6e40 commit b3f4727
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
cargo_cmd: fmt -- --check
os: ubuntu-latest
- component: clippy
cargo_cmd: clippy --locked --all-targets -- -D warnings -A clippy::type_complexity -A clippy::new-without-default
cargo_cmd: clippy --locked --all-targets -- -D warnings -A clippy::unknown-clippy-lints -A clippy::type_complexity -A clippy::new-without-default
steps:
- name: Clone repository
uses: actions/checkout@v1
Expand Down
2 changes: 2 additions & 0 deletions src/compiler/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -994,6 +994,8 @@ mod tests {
}
}

// https://github.com/rust-lang/rust-clippy/issues/6550
#[allow(clippy::from_iter_instead_of_collect)]
#[test]
fn test_argument_into_iter() {
// Needs type annotation or ascription
Expand Down
6 changes: 4 additions & 2 deletions tests/harness/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,10 @@ pub fn sccache_client_cfg(tmpdir: &Path) -> sccache::config::FileConfig {
fs::create_dir(tmpdir.join(cache_relpath)).unwrap();
fs::create_dir(tmpdir.join(dist_cache_relpath)).unwrap();

let mut disk_cache: sccache::config::DiskCacheConfig = Default::default();
disk_cache.dir = tmpdir.join(cache_relpath);
let disk_cache = sccache::config::DiskCacheConfig {
dir: tmpdir.join(cache_relpath),
..Default::default()
};
sccache::config::FileConfig {
cache: sccache::config::CacheConfigs {
azure: None,
Expand Down

0 comments on commit b3f4727

Please sign in to comment.