@@ -1131,14 +1131,14 @@ mod impl_ {
1131
1131
/// Finding msbuild.exe tool under unix system is not currently supported.
1132
1132
/// Maybe can check it using an environment variable looks like `MSBUILD_BIN`.
1133
1133
#[ 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 > {
1135
1135
None
1136
1136
}
1137
1137
1138
1138
// Finding devenv.exe tool under unix system is not currently supported.
1139
1139
// Maybe can check it using an environment variable looks like `DEVENV_BIN`.
1140
1140
#[ 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 > {
1142
1142
None
1143
1143
}
1144
1144
@@ -1174,24 +1174,36 @@ mod impl_ {
1174
1174
}
1175
1175
1176
1176
#[ 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 > {
1178
1182
None
1179
1183
}
1180
1184
1181
1185
// For MSVC 14 we need to find the Universal CRT as well as either
1182
1186
// the Windows 10 SDK or Windows 8.1 SDK.
1183
1187
#[ 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 > {
1185
1193
None
1186
1194
}
1187
1195
1188
1196
// For MSVC 12 we need to find the Windows 8.1 SDK.
1189
1197
#[ 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 > {
1191
1203
None
1192
1204
}
1193
1205
1194
- pub ( super ) fn has_msbuild_version < F > ( version : & str , _: F ) -> bool {
1206
+ pub ( super ) fn has_msbuild_version ( version : & str , _: & dyn EnvGetter ) -> bool {
1195
1207
match version {
1196
1208
"17.0" => false ,
1197
1209
"16.0" => false ,
0 commit comments