From 68e91a154ca98e915a27ecfdd80311efaabc78d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= <emil.gardstrom@gmail.com>
Date: Sat, 25 Jun 2022 17:02:15 +0200
Subject: [PATCH] aaa

---
 src/bin/commands/containers.rs  | 9 ++++-----
 src/docker/local.rs             | 2 +-
 src/docker/shared.rs            | 4 ++--
 src/lib.rs                      | 2 +-
 src/rustc.rs                    | 4 ++--
 src/tests.rs                    | 3 ++-
 xtask/src/build_docker_image.rs | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/bin/commands/containers.rs b/src/bin/commands/containers.rs
index af51f3b08..b2ff34413 100644
--- a/src/bin/commands/containers.rs
+++ b/src/bin/commands/containers.rs
@@ -2,10 +2,9 @@ use atty::Stream;
 use clap::{Args, Subcommand};
 use cross::{
     docker::{self, ImageArchitecture},
-    rustc::{QualifiedToolchain, Toolchain},
+    rustc::QualifiedToolchain,
     CommandExt,
 };
-use eyre::Context;
 
 #[derive(Args, Debug)]
 pub struct ListVolumes {
@@ -301,7 +300,7 @@ pub fn create_persistent_volume(
         ..
     }: CreateVolume,
     engine: &docker::Engine,
-    channel: Option<&str>,
+    _channel: Option<&str>,
 ) -> cross::Result<()> {
     // we only need a triple that needs docker: the actual target doesn't matter.
     let target = cross::Target::BuiltIn {
@@ -380,13 +379,13 @@ pub fn create_persistent_volume(
 
 pub fn remove_persistent_volume(
     RemoveVolume {
-        target,
+        target: _,
         docker_in_docker,
         verbose,
         ..
     }: RemoveVolume,
     engine: &docker::Engine,
-    channel: Option<&str>,
+    _channel: Option<&str>,
 ) -> cross::Result<()> {
     let toolchain = QualifiedToolchain::default(verbose)?;
     // TODO: channel
diff --git a/src/docker/local.rs b/src/docker/local.rs
index efcbb833f..b8d093442 100644
--- a/src/docker/local.rs
+++ b/src/docker/local.rs
@@ -85,7 +85,7 @@ pub(crate) fn run(
     }
     let mut image_name = image.name.clone();
     if needs_custom_image(target, config) {
-        image_name = custom_image_build(target, image, config, metadata, dirs, &engine, verbose)
+        image_name = custom_image_build(target, image, config, metadata, dirs, engine, verbose)
             .wrap_err("when building custom image")?
     }
 
diff --git a/src/docker/shared.rs b/src/docker/shared.rs
index a2cd43bee..22980af14 100644
--- a/src/docker/shared.rs
+++ b/src/docker/shared.rs
@@ -6,13 +6,13 @@ use std::{env, fs};
 use super::custom::Dockerfile;
 use super::engine::*;
 use super::image::PossibleImage;
-use super::{engine::*, Image, ImageArchitecture};
+use super::{Image, ImageArchitecture};
 use crate::cargo::{cargo_metadata_with_args, CargoMetadata};
 use crate::config::Config;
 use crate::extensions::{CommandExt, SafeCommand};
 use crate::file::{self, write_file, PathExt, ToUtf8};
 use crate::id;
-use crate::rustc::{self, QualifiedToolchain, VersionMetaExt};
+use crate::rustc::QualifiedToolchain;
 use crate::Target;
 use crate::{errors::*, TargetTriple};
 
diff --git a/src/lib.rs b/src/lib.rs
index 265b6852c..a95a5ff10 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -420,7 +420,7 @@ pub fn run(args: Args, target_list: TargetList, verbose: bool) -> Result<Option<
 
         // Grab the current toolchain, this might be the one we mount in the image later
         let default_toolchain = QualifiedToolchain::default(verbose)?;
-        let sysroot = default_toolchain.get_sysroot();
+        let _sysroot = default_toolchain.get_sysroot();
 
         // `cross +channel`, where channel can be `+channel[-YYYY-MM-DD]`
         let mut toolchain = if let Some(channel) = args.channel {
diff --git a/src/rustc.rs b/src/rustc.rs
index 1deaa7b92..015ebe307 100644
--- a/src/rustc.rs
+++ b/src/rustc.rs
@@ -5,9 +5,9 @@ use rustc_version::{Version, VersionMeta};
 use serde::Deserialize;
 
 use crate::docker::ImageArchitecture;
+use crate::errors::*;
 use crate::extensions::{env_program, CommandExt};
-use crate::{errors::*, Target};
-use crate::{rustup, TargetTriple};
+use crate::TargetTriple;
 
 #[derive(Debug)]
 pub struct TargetList {
diff --git a/src/tests.rs b/src/tests.rs
index da12d5e53..8f2e3d3ce 100644
--- a/src/tests.rs
+++ b/src/tests.rs
@@ -78,7 +78,8 @@ release: {version}
                 &QualifiedToolchain::new(
                     "xxxx",
                     &None,
-                    &ImageArchitecture::from_target(TargetTriple::X86_64UnknownLinuxGnu)
+                    &ImageArchitecture::from_target(TargetTriple::X86_64UnknownLinuxGnu),
+                    Path::new("/toolchains/xxxx-x86_64-unknown-linux-gnu"),
                 ),
                 &target_meta.0,
                 &target_meta.1
diff --git a/xtask/src/build_docker_image.rs b/xtask/src/build_docker_image.rs
index 4ade77fed..964b58fc2 100644
--- a/xtask/src/build_docker_image.rs
+++ b/xtask/src/build_docker_image.rs
@@ -2,8 +2,8 @@ use std::path::Path;
 
 use clap::Args;
 use color_eyre::Section;
+use cross::docker::ImageArchitecture;
 use cross::{docker, CommandExt, ToUtf8};
-use cross::{docker::ImageArchitecture, CommandExt};
 use std::fmt::Write;
 
 #[derive(Args, Debug)]