Skip to content

Commit

Permalink
Auto merge of #13466 - ehuss:more-redundant-use, r=weihanglo
Browse files Browse the repository at this point in the history
Fix more redundant imports.

The latest nightly has started warning about redundant imports. This removes those warnings.

Presumably these were casualties of merging between #13464 and #13409.
  • Loading branch information
bors committed Feb 20, 2024
2 parents 64ccff2 + b59333a commit 3fcbf73
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/bin/cargo/cli.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use anyhow::{anyhow, Context as _};
use cargo::core::shell::Shell;
use cargo::core::{features, CliUnstable};
use cargo::{drop_print, drop_println, CargoResult, GlobalContext};
use cargo::{drop_print, drop_println, CargoResult};
use clap::builder::UnknownArgumentValueParser;
use itertools::Itertools;
use std::collections::HashMap;
Expand Down
2 changes: 1 addition & 1 deletion src/bin/cargo/commands/help.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::aliased_command;
use crate::command_prelude::*;
use cargo::drop_println;
use cargo::util::errors::CargoResult;
use cargo::{drop_println, GlobalContext};
use cargo_util::paths::resolve_executable;
use flate2::read::GzDecoder;
use std::ffi::OsStr;
Expand Down
2 changes: 1 addition & 1 deletion src/bin/cargo/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use cargo::util::network::http::http_handle;
use cargo::util::network::http::needs_custom_http_transport;
use cargo::util::{self, closest_msg, command_prelude, CargoResult, GlobalContext};
use cargo::util::{self, closest_msg, command_prelude, CargoResult};
use cargo_util::{ProcessBuilder, ProcessError};
use cargo_util_schemas::manifest::StringOrVec;
use std::collections::BTreeMap;
Expand Down

0 comments on commit 3fcbf73

Please sign in to comment.