Skip to content

Commit 019165f

Browse files
committed
style: Remove wildcard imports
This is based on review feedback from #4551. I experimented with a `clippy.toml` file for "blessing" some of these, like `errors`, but for some reason I wasn't able to get it to work.
1 parent 9c61986 commit 019165f

File tree

12 files changed

+21
-14
lines changed

12 files changed

+21
-14
lines changed

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ unused_qualifications = "warn"
151151
# `dbg!()` and `todo!()` clearly shouldn't make it to production:
152152
dbg_macro = "warn"
153153
todo = "warn"
154+
wildcard_imports = "warn"
154155

155156
[lib]
156157
name = "rustup"

src/cli/rustup_mode.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ use crate::{
2727
cli::{
2828
common::{self, PackageUpdate, update_console_filter},
2929
errors::CliError,
30-
help::*,
30+
help::{
31+
COMPLETIONS_HELP, DEFAULT_HELP, DOC_HELP, INSTALL_HELP,
32+
MAYBE_RESOLVABLE_TOOLCHAIN_ARG_HELP, OFFICIAL_TOOLCHAIN_ARG_HELP, OVERRIDE_HELP,
33+
OVERRIDE_UNSET_HELP, RESOLVABLE_LOCAL_TOOLCHAIN_ARG_HELP,
34+
RESOLVABLE_TOOLCHAIN_ARG_HELP, RUN_HELP, RUSTUP_HELP, SHOW_ACTIVE_TOOLCHAIN_HELP,
35+
SHOW_HELP, TOOLCHAIN_HELP, TOOLCHAIN_LINK_HELP, TOPIC_ARG_HELP, UPDATE_HELP,
36+
},
3137
self_update::{self, SelfUpdateMode, check_rustup_update},
3238
topical_doc,
3339
},

src/cli/self_update.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ use crate::{
5555
DUP_TOOLS, TOOLS,
5656
cli::{
5757
common::{self, Confirm, PackageUpdate, ignorable_error, report_error},
58-
errors::*,
58+
errors::CliError,
5959
markdown::md,
6060
},
6161
config::Cfg,

src/dist/component/package.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ use tar::EntryType;
1414
use tracing::{error, trace, warn};
1515

1616
use crate::diskio::{CompletedIo, Executor, FileBuffer, IO_CHUNK_SIZE, Item, Kind, get_executor};
17-
use crate::dist::component::components::*;
18-
use crate::dist::component::transaction::*;
17+
use crate::dist::component::components::{ComponentPart, ComponentPartKind, Components};
18+
use crate::dist::component::transaction::Transaction;
1919
use crate::dist::download::DownloadCfg;
2020
use crate::dist::temp;
21-
use crate::errors::*;
21+
use crate::errors::RustupError;
2222
use crate::utils;
2323
use crate::utils::units::Size;
2424

src/dist/component/transaction.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ use tracing::{error, info};
1717

1818
use crate::dist::prefix::InstallPrefix;
1919
use crate::dist::temp;
20-
use crate::errors::*;
20+
use crate::errors::RustupError;
2121
use crate::process::Process;
2222
use crate::utils;
2323

src/dist/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use anyhow::{Context, Result};
55
use serde::{Deserialize, Serialize};
66

77
use super::manifest::Component;
8-
use crate::errors::*;
8+
use crate::errors::RustupError;
99

1010
#[derive(Clone, Debug, Default, Deserialize, Serialize)]
1111
pub struct Config {

src/dist/download.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use url::Url;
1414
use crate::config::Cfg;
1515
use crate::dist::temp;
1616
use crate::download::{download_file, download_file_with_resume};
17-
use crate::errors::*;
17+
use crate::errors::RustupError;
1818
use crate::process::Process;
1919
use crate::utils;
2020

src/dist/manifest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use serde::{Deserialize, Serialize};
2323

2424
use crate::{
2525
dist::{Profile, TargetTriple, ToolchainDesc, config::Config},
26-
errors::*,
26+
errors::RustupError,
2727
toolchain::DistributableToolchain,
2828
};
2929

@@ -249,7 +249,7 @@ impl Hash for Component {
249249
}
250250

251251
mod component_target {
252-
use super::*;
252+
use super::{Result, TargetTriple};
253253
use serde::{Deserialize, Deserializer, Serializer};
254254

255255
pub fn serialize<S: Serializer>(

src/dist/manifestation.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -635,7 +635,7 @@ impl Update {
635635
.components_to_install
636636
.iter()
637637
.filter(|c| {
638-
use crate::dist::manifest::*;
638+
use crate::dist::manifest::{Package, TargetedPackage};
639639
let pkg: Option<&Package> =
640640
new_manifest.get_package(c.short_name_in_manifest()).ok();
641641
let target_pkg: Option<&TargetedPackage> =

src/process/file_source.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mod test_support {
2828
sync::{Arc, Mutex, MutexGuard},
2929
};
3030

31-
use super::*;
31+
use super::{BufRead, Read, Stdin, StdinLock, io};
3232

3333
// ----------------------- test support for stdin ------------------
3434

0 commit comments

Comments
 (0)