Skip to content

Commit db71e85

Browse files
committed
Remove generics in windows_registry
Signed-off-by: Jiahao XU <[email protected]>
1 parent a468aaa commit db71e85

File tree

1 file changed

+18
-6
lines changed

1 file changed

+18
-6
lines changed

src/windows/find_tools.rs

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,14 +1131,14 @@ mod impl_ {
11311131
/// Finding msbuild.exe tool under unix system is not currently supported.
11321132
/// Maybe can check it using an environment variable looks like `MSBUILD_BIN`.
11331133
#[inline(always)]
1134-
pub(super) fn find_msbuild<F>(_target: TargetArch<'_>, _: F) -> Option<Tool> {
1134+
pub(super) fn find_msbuild(_target: TargetArch<'_>, _: &dyn EnvGetter) -> Option<Tool> {
11351135
None
11361136
}
11371137

11381138
// Finding devenv.exe tool under unix system is not currently supported.
11391139
// Maybe can check it using an environment variable looks like `DEVENV_BIN`.
11401140
#[inline(always)]
1141-
pub(super) fn find_devenv<F>(_target: TargetArch<'_>, _: F) -> Option<Tool> {
1141+
pub(super) fn find_devenv(_target: TargetArch<'_>, _: &dyn EnvGetter) -> Option<Tool> {
11421142
None
11431143
}
11441144

@@ -1174,24 +1174,36 @@ mod impl_ {
11741174
}
11751175

11761176
#[inline(always)]
1177-
pub(super) fn find_msvc_15plus<F>(_tool: &str, _target: TargetArch<'_>, _: F) -> Option<Tool> {
1177+
pub(super) fn find_msvc_15plus(
1178+
_tool: &str,
1179+
_target: TargetArch<'_>,
1180+
_: &dyn EnvGetter,
1181+
) -> Option<Tool> {
11781182
None
11791183
}
11801184

11811185
// For MSVC 14 we need to find the Universal CRT as well as either
11821186
// the Windows 10 SDK or Windows 8.1 SDK.
11831187
#[inline(always)]
1184-
pub(super) fn find_msvc_14<F>(_tool: &str, _target: TargetArch<'_>, _: F) -> Option<Tool> {
1188+
pub(super) fn find_msvc_14(
1189+
_tool: &str,
1190+
_target: TargetArch<'_>,
1191+
_: &dyn EnvGetter,
1192+
) -> Option<Tool> {
11851193
None
11861194
}
11871195

11881196
// For MSVC 12 we need to find the Windows 8.1 SDK.
11891197
#[inline(always)]
1190-
pub(super) fn find_msvc_12<F>(_tool: &str, _target: TargetArch<'_>, _: F) -> Option<Tool> {
1198+
pub(super) fn find_msvc_12(
1199+
_tool: &str,
1200+
_target: TargetArch<'_>,
1201+
_: &dyn EnvGetter,
1202+
) -> Option<Tool> {
11911203
None
11921204
}
11931205

1194-
pub(super) fn has_msbuild_version<F>(version: &str, _: F) -> bool {
1206+
pub(super) fn has_msbuild_version(version: &str, _: &dyn EnvGetter) -> bool {
11951207
match version {
11961208
"17.0" => false,
11971209
"16.0" => false,

0 commit comments

Comments
 (0)