Type parameter simplification

src/compiler/c.rs

@@ -213,7 +213,7 @@ impl<T, I> CompilerHasher<T> for CCompilerHasher<I>
                          cwd: PathBuf,
                          env_vars: Vec<(OsString, OsString)>,
                          _pool: &CpuPool)
-                         -> SFuture<HashResult<T>>
+                         -> SFuture<HashResult>
     {
         let me = *self;
         let CCompilerHasher { parsed_args, executable, executable_digest, compiler } = me;
@@ -306,7 +306,7 @@ impl<T, I> CompilerHasher<T> for CCompilerHasher<I>
     }
 }
 
-impl<T: CommandCreatorSync, I: CCompilerImpl> Compilation<T> for CCompilation<I> {
+impl<I: CCompilerImpl> Compilation for CCompilation<I> {
     fn generate_compile_commands(&self)
                                 -> Result<(CompileCommand, Option<dist::CompileCommand>, Cacheable)>
     {

src/compiler/compiler.rs

@@ -115,7 +115,7 @@ pub trait CompilerHasher<T>: fmt::Debug + Send + 'static
                          cwd: PathBuf,
                          env_vars: Vec<(OsString, OsString)>,
                          pool: &CpuPool)
-                         -> SFuture<HashResult<T>>;
+                         -> SFuture<HashResult>;
 
     /// Return the state of any `--color` option passed to the compiler.
     fn color_mode(&self) -> ColorMode;
@@ -311,7 +311,7 @@ pub trait CompilerHasher<T>: fmt::Debug + Send + 'static
 fn dist_or_local_compile<T>(dist_client: Arc<dist::Client>,
                             creator: T,
                             cwd: PathBuf,
-                            compilation: Box<Compilation<T>>,
+                            compilation: Box<Compilation>,
                             weak_toolchain_key: String,
                             toolchain_creator: Box<FnMut(File)>,
                             out_pretty: String)
@@ -382,9 +382,7 @@ impl<T: CommandCreatorSync> Clone for Box<CompilerHasher<T>> {
 }
 
 /// An interface to a compiler for actually invoking compilation.
-pub trait Compilation<T>
-    where T: CommandCreatorSync,
-{
+pub trait Compilation {
     /// Given information about a compiler command, generate a command that can
     /// execute the compiler.
     fn generate_compile_commands(&self)
@@ -404,11 +402,11 @@ pub trait Compilation<T>
 }
 
 /// Result of generating a hash from a compiler command.
-pub struct HashResult<T: CommandCreatorSync> {
+pub struct HashResult {
     /// The hash key of the inputs.
     pub key: String,
     /// An object to use for the actual compilation, if necessary.
-    pub compilation: Box<Compilation<T> + 'static>,
+    pub compilation: Box<Compilation + 'static>,
     /// A weak key that may be used to identify the toolchain
     pub weak_toolchain_key: String,
     /// A function that may be called to save the toolchain to a file

src/compiler/rust.rs

@@ -595,7 +595,7 @@ impl<T> CompilerHasher<T> for RustHasher
                          cwd: PathBuf,
                          env_vars: Vec<(OsString, OsString)>,
                          pool: &CpuPool)
-                         -> SFuture<HashResult<T>>
+                         -> SFuture<HashResult>
     {
         let me = *self;
         let RustHasher { executable, sysroot, compiler_shlibs_digests, parsed_args: ParsedArguments { arguments, output_dir, externs, staticlibs, crate_name, dep_info, color_mode: _ } } = me;
@@ -741,9 +741,7 @@ impl<T> CompilerHasher<T> for RustHasher
     }
 }
 
-impl<T> Compilation<T> for RustCompilation
-    where T: CommandCreatorSync,
-{
+impl Compilation for RustCompilation {
     fn generate_compile_commands(&self)
                                 -> Result<(CompileCommand, Option<dist::CompileCommand>, Cacheable)>
     {