@@ -136,8 +136,7 @@ impl Config {
136
136
"release" | "bench" => RustProfile :: Release ,
137
137
unknown => {
138
138
eprintln ! (
139
- "Warning: unknown Rust profile={}; defaulting to a release build." ,
140
- unknown
139
+ "Warning: unknown Rust profile={unknown}; defaulting to a release build."
141
140
) ;
142
141
RustProfile :: Release
143
142
}
@@ -153,8 +152,7 @@ impl Config {
153
152
RustProfile :: Release => OptLevel :: Release ,
154
153
} ;
155
154
eprintln ! (
156
- "Warning: unknown opt-level={}; defaulting to a {:?} build." ,
157
- unknown, default_opt_level
155
+ "Warning: unknown opt-level={unknown}; defaulting to a {default_opt_level:?} build."
158
156
) ;
159
157
default_opt_level
160
158
}
@@ -164,7 +162,7 @@ impl Config {
164
162
"false" => false ,
165
163
"true" => true ,
166
164
unknown => {
167
- eprintln ! ( "Warning: unknown debug={}; defaulting to `true`." , unknown ) ;
165
+ eprintln ! ( "Warning: unknown debug={unknown }; defaulting to `true`." ) ;
168
166
true
169
167
}
170
168
} ;
@@ -562,7 +560,7 @@ impl Config {
562
560
let mut cmake_prefix_path = Vec :: new ( ) ;
563
561
for dep in & self . deps {
564
562
let dep = dep. to_uppercase ( ) . replace ( '-' , "_" ) ;
565
- if let Some ( root) = env:: var_os ( format ! ( "DEP_{}_ROOT" , dep ) ) {
563
+ if let Some ( root) = env:: var_os ( format ! ( "DEP_{dep }_ROOT" ) ) {
566
564
cmake_prefix_path. push ( PathBuf :: from ( root) ) ;
567
565
}
568
566
}
@@ -667,7 +665,7 @@ impl Config {
667
665
}
668
666
cmd. arg ( "-AWin32" ) ;
669
667
} else {
670
- panic ! ( "unsupported msvc target: {}" , target ) ;
668
+ panic ! ( "unsupported msvc target: {target}" ) ;
671
669
}
672
670
}
673
671
} else if target. contains ( "apple" ) {
@@ -689,7 +687,7 @@ impl Config {
689
687
} else if target. contains ( "arm64_32" ) {
690
688
cmd. arg ( "-DCMAKE_OSX_ARCHITECTURES=arm64_32" ) ;
691
689
} else {
692
- panic ! ( "unsupported apple target: {}" , target ) ;
690
+ panic ! ( "unsupported apple target: {target}" ) ;
693
691
}
694
692
}
695
693
@@ -756,8 +754,8 @@ impl Config {
756
754
None => false ,
757
755
} ;
758
756
let mut set_compiler = |kind : & str , compiler : & cc:: Tool , extra : & OsString | {
759
- let flag_var = format ! ( "CMAKE_{}_FLAGS" , kind ) ;
760
- let tool_var = format ! ( "CMAKE_{}_COMPILER" , kind ) ;
757
+ let flag_var = format ! ( "CMAKE_{kind }_FLAGS" ) ;
758
+ let tool_var = format ! ( "CMAKE_{kind }_COMPILER" ) ;
761
759
if !self . defined ( & flag_var) {
762
760
let mut flagsflag = OsString :: from ( "-D" ) ;
763
761
flagsflag. push ( & flag_var) ;
@@ -781,7 +779,7 @@ impl Config {
781
779
// Note that for other generators, though, this *overrides*
782
780
// things like the optimization flags, which is bad.
783
781
if generator. is_none ( ) && msvc {
784
- let flag_var_alt = format ! ( "CMAKE_{}_FLAGS_{}" , kind , build_type_upcase ) ;
782
+ let flag_var_alt = format ! ( "CMAKE_{kind }_FLAGS_{build_type_upcase}" ) ;
785
783
if !self . defined ( & flag_var_alt) {
786
784
let mut flagsflag = OsString :: from ( "-D" ) ;
787
785
flagsflag. push ( & flag_var_alt) ;
@@ -843,7 +841,7 @@ impl Config {
843
841
}
844
842
845
843
if !self . defined ( "CMAKE_BUILD_TYPE" ) {
846
- cmd. arg ( format ! ( "-DCMAKE_BUILD_TYPE={}" , profile ) ) ;
844
+ cmd. arg ( format ! ( "-DCMAKE_BUILD_TYPE={profile}" ) ) ;
847
845
}
848
846
849
847
if self . verbose_make {
@@ -968,7 +966,7 @@ impl Config {
968
966
return val. clone ( ) ;
969
967
}
970
968
let r = env:: var_os ( v) ;
971
- println ! ( "{} = {:?}" , v , r ) ;
969
+ println ! ( "{v } = {r :?}" ) ;
972
970
self . env_cache . insert ( v. to_string ( ) , r. clone ( ) ) ;
973
971
r
974
972
}
@@ -983,9 +981,9 @@ impl Config {
983
981
984
982
let kind = if host == target { "HOST" } else { "TARGET" } ;
985
983
let target_u = target. replace ( '-' , "_" ) ;
986
- self . getenv_os ( & format ! ( "{}_{}" , var_base , target ) )
987
- . or_else ( || self . getenv_os ( & format ! ( "{}_{}" , var_base , target_u ) ) )
988
- . or_else ( || self . getenv_os ( & format ! ( "{}_{}" , kind , var_base ) ) )
984
+ self . getenv_os ( & format ! ( "{var_base }_{target}" ) )
985
+ . or_else ( || self . getenv_os ( & format ! ( "{var_base }_{target_u}" ) ) )
986
+ . or_else ( || self . getenv_os ( & format ! ( "{kind }_{var_base}" ) ) )
989
987
. or_else ( || self . getenv_os ( var_base) )
990
988
}
991
989
@@ -1013,7 +1011,7 @@ impl Config {
1013
1011
{
1014
1012
base. to_string ( )
1015
1013
} else {
1016
- panic ! ( "unsupported msvc target: {}" , target ) ;
1014
+ panic ! ( "unsupported msvc target: {target}" ) ;
1017
1015
}
1018
1016
}
1019
1017
@@ -1114,27 +1112,24 @@ impl Default for Version {
1114
1112
}
1115
1113
1116
1114
fn run ( cmd : & mut Command , program : & str ) {
1117
- println ! ( "running: {:?}" , cmd ) ;
1115
+ println ! ( "running: {cmd :?}" ) ;
1118
1116
let status = match cmd. status ( ) {
1119
1117
Ok ( status) => status,
1120
1118
Err ( ref e) if e. kind ( ) == ErrorKind :: NotFound => {
1121
1119
fail ( & format ! (
1122
- "failed to execute command: {}\n is `{}` not installed?" ,
1123
- e, program
1120
+ "failed to execute command: {e}\n is `{program}` not installed?"
1124
1121
) ) ;
1125
1122
}
1126
- Err ( e) => fail ( & format ! ( "failed to execute command: {}" , e ) ) ,
1123
+ Err ( e) => fail ( & format ! ( "failed to execute command: {e}" ) ) ,
1127
1124
} ;
1128
1125
if !status. success ( ) {
1129
1126
if status. code ( ) == Some ( 127 ) {
1130
1127
fail ( & format ! (
1131
- "command did not execute successfully, got: {}, is `{}` not installed?" ,
1132
- status, program
1128
+ "command did not execute successfully, got: {status}, is `{program}` not installed?"
1133
1129
) ) ;
1134
1130
}
1135
1131
fail ( & format ! (
1136
- "command did not execute successfully, got: {}" ,
1137
- status
1132
+ "command did not execute successfully, got: {status}"
1138
1133
) ) ;
1139
1134
}
1140
1135
}
@@ -1149,12 +1144,12 @@ fn find_exe(path: &Path) -> PathBuf {
1149
1144
fn getenv_unwrap ( v : & str ) -> String {
1150
1145
match env:: var ( v) {
1151
1146
Ok ( s) => s,
1152
- Err ( ..) => fail ( & format ! ( "environment variable `{}` not defined" , v ) ) ,
1147
+ Err ( ..) => fail ( & format ! ( "environment variable `{v }` not defined" ) ) ,
1153
1148
}
1154
1149
}
1155
1150
1156
1151
fn fail ( s : & str ) -> ! {
1157
- panic ! ( "\n {}\n \n build script failed, must exit now" , s )
1152
+ panic ! ( "\n {s }\n \n build script failed, must exit now" )
1158
1153
}
1159
1154
1160
1155
/// Returns whether the given MAKEFLAGS indicate that there is an available
0 commit comments