Skip to content

Commit

Permalink
Fix compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
ry authored and froydnj committed Mar 8, 2020
1 parent 4bab0d3 commit 294551c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/bin/sccache-dist/token_check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ fn check_mozilla_profile(user: &str, required_groups: &[String], profile: &str)
#[test]
fn test_auth_verify_check_mozilla_profile() {
// A successful response
let profile = r#"{
let profile = r#"{
"sub": "ad|Mozilla-LDAP|asayers",
"https://sso.mozilla.com/claim/groups": [
"everyone",
Expand Down
5 changes: 2 additions & 3 deletions src/compiler/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ mod tests {
"-quxbar", // -quxbar is not -qux with a value of bar
"-qux=value",
];
let iter = ArgsIter::new(args.into_iter().map(OsString::from), &ARGS[..]);
let iter = ArgsIter::new(args.iter().map(OsString::from), &ARGS[..]);
let expected = vec![
arg!(UnknownFlag("-nomatch")),
arg!(WithValue("-foo", ArgData::Foo("value"), Separated)),
Expand Down Expand Up @@ -1029,8 +1029,7 @@ mod tests {

#[test]
fn test_arginfo_process_take_concat_arg_delim_doesnt_crash() {
let _ = take_arg!("-foo", OsString, Concatenated('='), Foo)
.process("-foo", || None);
let _ = take_arg!("-foo", OsString, Concatenated('='), Foo).process("-foo", || None);
}

#[cfg(debug_assertions)]
Expand Down
3 changes: 1 addition & 2 deletions src/compiler/c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ use std::hash::Hash;
use std::io;
use std::path::{Path, PathBuf};
use std::process;
use which::which;

use crate::errors::*;

Expand Down Expand Up @@ -551,7 +550,7 @@ impl pkg::ToolchainPackager for CToolchainPackager {
if path.is_absolute() {
Some(path)
} else {
which(path).ok()
which::which(path).ok()
}
};

Expand Down
2 changes: 1 addition & 1 deletion src/compiler/msvc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use crate::compiler::{
};
use crate::dist;
use crate::mock_command::{CommandCreatorSync, RunCommand};
use crate::util::{run_input_output, OsStrExt};
use crate::util::run_input_output;
use futures::future::Future;
use futures_cpupool::CpuPool;
use local_encoding::{Encoder, Encoding};
Expand Down

0 comments on commit 294551c

Please sign in to comment.