Skip to content

Commit 4d55397

Browse files
djcrami3l
authored andcommitted
config: rename OverrideDB to OverrideDb
1 parent 42fc5f4 commit 4d55397

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/config.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ pub(crate) enum ActiveSource {
9393
Default,
9494
Environment,
9595
CommandLine,
96-
OverrideDB(PathBuf),
96+
OverrideDb(PathBuf),
9797
ToolchainFile(PathBuf),
9898
}
9999

@@ -105,7 +105,7 @@ impl ActiveSource {
105105
String::from("overridden by environment variable RUSTUP_TOOLCHAIN")
106106
}
107107
Self::CommandLine => String::from("overridden by +toolchain on the command line"),
108-
Self::OverrideDB(path) => format!("directory override for '{}'", path.display()),
108+
Self::OverrideDb(path) => format!("directory override for '{}'", path.display()),
109109
Self::ToolchainFile(path) => format!("overridden by '{}'", path.display()),
110110
}
111111
}
@@ -117,7 +117,7 @@ impl Display for ActiveSource {
117117
Self::Default => "default",
118118
Self::Environment => "env",
119119
Self::CommandLine => "cli",
120-
Self::OverrideDB(_) => "path-override",
120+
Self::OverrideDb(_) => "path-override",
121121
Self::ToolchainFile(_) => "toolchain-file",
122122
})
123123
}
@@ -571,7 +571,7 @@ impl<'a> Cfg<'a> {
571571
while let Some(d) = dir {
572572
// First check the override database
573573
if let Some(name) = settings.dir_override(d) {
574-
let source = ActiveSource::OverrideDB(d.to_owned());
574+
let source = ActiveSource::OverrideDb(d.to_owned());
575575
// Note that `rustup override set` fully resolves it's input
576576
// before writing to settings.toml, so resolving here may not
577577
// be strictly necessary (could instead model as ToolchainName).

src/toolchain.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ impl<'a> Toolchain<'a> {
9494
ActiveSource::CommandLine => {
9595
"the +toolchain on the command line specifies an uninstalled toolchain".to_string()
9696
}
97-
ActiveSource::OverrideDB(path) => format!(
97+
ActiveSource::OverrideDb(path) => format!(
9898
"the directory override for '{}' specifies an uninstalled toolchain",
9999
utils::canonicalize_path(path).display(),
100100
),

0 commit comments

Comments
 (0)