File tree 1 file changed +15
-12
lines changed
1 file changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -198,6 +198,7 @@ BACKTRACE_RS_ANDROID_APIVERSION __ANDROID_API__
198
198
// Create `android-api.c` on demand.
199
199
let out_dir = env:: var_os ( "OUT_DIR" ) . unwrap ( ) ;
200
200
let android_api_c = Path :: new ( & out_dir) . join ( "android-api.c" ) ;
201
+
201
202
std:: fs:: write ( & android_api_c, ANDROID_API_C ) . unwrap ( ) ;
202
203
203
204
let expansion = match cc:: Build :: new ( ) . file ( & android_api_c) . try_expand ( ) {
@@ -207,23 +208,25 @@ BACKTRACE_RS_ANDROID_APIVERSION __ANDROID_API__
207
208
return ;
208
209
}
209
210
} ;
210
- let expansion = match std :: str :: from_utf8 ( & expansion ) {
211
- Ok ( s ) => s ,
212
- Err ( _ ) => return ,
211
+
212
+ let Ok ( expansion ) = std :: str :: from_utf8 ( & expansion ) else {
213
+ return ;
213
214
} ;
215
+
214
216
eprintln ! ( "expanded android version detection:\n {expansion}" ) ;
215
- let i = match expansion . find ( MARKER ) {
216
- Some ( i) => i ,
217
- None => return ,
217
+
218
+ let Some ( i) = expansion . find ( MARKER ) else {
219
+ return ;
218
220
} ;
219
- let version = match expansion [ i + MARKER . len ( ) + 1 .. ] . split_whitespace ( ) . next ( ) {
220
- Some ( s ) => s ,
221
- None => return ,
221
+
222
+ let Some ( version ) = expansion [ i + MARKER . len ( ) + 1 .. ] . split_whitespace ( ) . next ( ) else {
223
+ return ;
222
224
} ;
223
- let version = match version . parse :: < u32 > ( ) {
224
- Ok ( n ) => n ,
225
- Err ( _ ) => return ,
225
+
226
+ let Ok ( version ) = version . parse :: < u32 > ( ) else {
227
+ return ;
226
228
} ;
229
+
227
230
if version >= 21 {
228
231
println ! ( "cargo:rustc-cfg=feature=\" dl_iterate_phdr\" " ) ;
229
232
}
You can’t perform that action at this time.
0 commit comments