This patch fixes various warnings:

* Allow unused fields in CCompilerPackager and RustCompilerPackager
* Fix some unused warning in the sccache_cargo mod by moving use directives

This patch contains no functional change.
This commit is contained in:
Felix Obenhuber 2018-09-05 11:05:01 +02:00 коммит произвёл Ted Mielczarek
Родитель 476d807a0b
Коммит 43f82e72d2
5 изменённых файлов: 25 добавлений и 19 удалений

Просмотреть файл

@ -342,6 +342,7 @@ impl<I: CCompilerImpl> Compilation for CCompilation<I> {
}
struct CCompilerPackager {
#[allow(dead_code)]
executable: PathBuf,
}

Просмотреть файл

@ -866,6 +866,7 @@ impl Compilation for RustCompilation {
}
struct RustCompilerPackager {
#[allow(dead_code)]
sysroot: PathBuf,
}

Просмотреть файл

@ -36,8 +36,10 @@ use std::io::{
Cursor,
Write,
};
#[cfg(not(target_os="macos"))]
use std::net::TcpListener;
use std::path::Path;
#[cfg(not(target_os="macos"))]
use std::process::Command;
use std::sync::{Arc,Mutex,mpsc};
use std::thread;

Просмотреть файл

@ -85,6 +85,7 @@ pub fn next_command_calls<C: Fn(&[OsString]) -> Result<MockChild> + Send + 'stat
creator.lock().unwrap().next_command_calls(call);
}
#[cfg(not(target_os="macos"))]
pub fn find_sccache_binary() -> PathBuf {
// Older versions of cargo put the test binary next to the sccache binary.
// Newer versions put it in the deps/ subdirectory.

Просмотреть файл

@ -6,35 +6,36 @@
extern crate assert_cmd;
extern crate chrono;
extern crate env_logger;
#[cfg(not(target_os="macos"))]
#[macro_use]
extern crate log;
extern crate predicates;
extern crate tempdir;
use std::env;
use std::io::Write;
use std::fs;
use std::path::Path;
use assert_cmd::prelude::*;
use chrono::Local;
use predicates::prelude::*;
use std::process::{Command, Stdio};
use tempdir::TempDir;
fn stop() {
trace!("sccache --stop-server");
drop(Command::main_binary().unwrap()
.arg("--stop-server")
.stdout(Stdio::null())
.stderr(Stdio::null())
.status());
}
/// Test that building a simple Rust crate with cargo using sccache results in a cache hit
/// when built a second time.
#[test]
#[cfg(not(target_os="macos"))] // test currently fails on macos
fn test_rust_cargo() {
use std::env;
use std::io::Write;
use std::fs;
use std::path::Path;
use assert_cmd::prelude::*;
use chrono::Local;
use predicates::prelude::*;
use std::process::{Command, Stdio};
use tempdir::TempDir;
fn stop() {
trace!("sccache --stop-server");
drop(Command::main_binary().unwrap()
.arg("--stop-server")
.stdout(Stdio::null())
.stderr(Stdio::null())
.status());
}
drop(env_logger::Builder::new()
.format(|f, record| {
write!(