Skip to content

Commit d73a86a

Browse files
committed
Drop u32 cast from rustls_result
1 parent 94c0299 commit d73a86a

1 file changed

Lines changed: 51 additions & 49 deletions

File tree

rules/rustls/tgt_unsafe.rs

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ fn t4() -> ::rustls_ffi::rslice::rustls_str<'static> {
1616
fn t5() -> ::rustls_ffi::rustls_result {
1717
::rustls_ffi::rustls_result::Ok
1818
}
19-
fn t6() -> ::rustls_ffi::rustls_io_result {
20-
::rustls_ffi::rustls_io_result(0)
19+
fn t6() -> i32 {
20+
0_i32
2121
}
2222
fn t7() -> ::rustls_ffi::enums::rustls_tls_version {
2323
::rustls_ffi::enums::rustls_tls_version::Unknown
@@ -48,19 +48,19 @@ unsafe fn f7(
4848
a1: *mut u8,
4949
a2: usize,
5050
a3: *mut usize,
51-
) -> u32 {
52-
::rustls_ffi::connection::rustls_connection::rustls_connection_read(a0, a1, a2, a3) as u32
51+
) -> ::rustls_ffi::rustls_result {
52+
::rustls_ffi::connection::rustls_connection::rustls_connection_read(a0, a1, a2, a3)
5353
}
5454
unsafe fn f8(
5555
a0: *mut ::rustls_ffi::connection::rustls_connection,
5656
a1: *const u8,
5757
a2: usize,
5858
a3: *mut usize,
59-
) -> u32 {
60-
::rustls_ffi::connection::rustls_connection::rustls_connection_write(a0, a1, a2, a3) as u32
59+
) -> ::rustls_ffi::rustls_result {
60+
::rustls_ffi::connection::rustls_connection::rustls_connection_write(a0, a1, a2, a3)
6161
}
62-
unsafe fn f9(a0: *mut ::rustls_ffi::connection::rustls_connection) -> u32 {
63-
::rustls_ffi::connection::rustls_connection::rustls_connection_process_new_packets(a0) as u32
62+
unsafe fn f9(a0: *mut ::rustls_ffi::connection::rustls_connection) -> ::rustls_ffi::rustls_result {
63+
::rustls_ffi::connection::rustls_connection::rustls_connection_process_new_packets(a0)
6464
}
6565
unsafe fn f10(a0: *const ::rustls_ffi::connection::rustls_connection) -> bool {
6666
::rustls_ffi::connection::rustls_connection::rustls_connection_wants_read(a0)
@@ -179,9 +179,8 @@ fn t29() -> ::rustls_ffi::client::rustls_verify_server_cert_params<'static> {
179179
unsafe fn f21(
180180
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
181181
a1: *mut *const ::rustls_ffi::client::rustls_client_config,
182-
) -> u32 {
182+
) -> ::rustls_ffi::rustls_result {
183183
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_build(a0, a1)
184-
as u32
185184
}
186185
unsafe fn f22(a0: *mut ::rustls_ffi::client::rustls_client_config_builder) {
187186
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_free(a0)
@@ -191,24 +190,24 @@ unsafe fn f23(
191190
a1: *const u16,
192191
a2: usize,
193192
a3: *mut *mut ::rustls_ffi::client::rustls_client_config_builder,
194-
) -> u32 {
193+
) -> ::rustls_ffi::rustls_result {
195194
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_new_custom(
196195
a0, a1, a2, a3,
197-
) as u32
196+
)
198197
}
199198
unsafe fn f24(
200199
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
201200
a1: *const ::rustls_ffi::rslice::rustls_slice_bytes<'static>,
202201
a2: usize,
203-
) -> u32 {
204-
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_alpn_protocols(a0, a1, a2) as u32
202+
) -> ::rustls_ffi::rustls_result {
203+
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_alpn_protocols(a0, a1, a2)
205204
}
206205
unsafe fn f25(
207206
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
208207
a1: *const *const ::rustls_ffi::certificate::rustls_certified_key,
209208
a2: usize,
210-
) -> u32 {
211-
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_certified_key(a0, a1, a2) as u32
209+
) -> ::rustls_ffi::rustls_result {
210+
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_certified_key(a0, a1, a2)
212211
}
213212
unsafe fn f26(
214213
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
@@ -223,52 +222,53 @@ unsafe fn f28(
223222
a0: *const ::rustls_ffi::client::rustls_client_config,
224223
a1: *const u8,
225224
a2: *mut *mut ::rustls_ffi::connection::rustls_connection,
226-
) -> u32 {
225+
) -> ::rustls_ffi::rustls_result {
227226
::rustls_ffi::client::rustls_client_config::rustls_client_connection_new(
228227
a0,
229228
a1 as *const ::std::ffi::c_char,
230229
a2,
231-
) as u32
230+
)
232231
}
233232

234233
unsafe fn f29(
235234
a0: *const ::rustls_ffi::certificate::rustls_certificate<'static>,
236235
a1: *mut *const u8,
237236
a2: *mut usize,
238-
) -> u32 {
239-
::rustls_ffi::certificate::rustls_certificate_get_der(a0, a1, a2) as u32
237+
) -> ::rustls_ffi::rustls_result {
238+
::rustls_ffi::certificate::rustls_certificate_get_der(a0, a1, a2)
240239
}
241240
unsafe fn f30(
242241
a0: *const u8,
243242
a1: usize,
244243
a2: *const u8,
245244
a3: usize,
246245
a4: *mut *const ::rustls_ffi::certificate::rustls_certified_key,
247-
) -> u32 {
246+
) -> ::rustls_ffi::rustls_result {
248247
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_build(a0, a1, a2, a3, a4)
249-
as u32
250248
}
251249
unsafe fn f31(a0: *const ::rustls_ffi::certificate::rustls_certified_key) {
252250
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_free(a0)
253251
}
254-
unsafe fn f32(a0: *const ::rustls_ffi::certificate::rustls_certified_key) -> u32 {
255-
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_keys_match(a0) as u32
252+
unsafe fn f32(
253+
a0: *const ::rustls_ffi::certificate::rustls_certified_key,
254+
) -> ::rustls_ffi::rustls_result {
255+
::rustls_ffi::certificate::rustls_certified_key::rustls_certified_key_keys_match(a0)
256256
}
257257
unsafe fn f33(
258258
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
259259
a1: *const u8,
260260
a2: usize,
261261
a3: bool,
262-
) -> u32 {
263-
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_add_pem(a0, a1, a2, a3) as u32
262+
) -> ::rustls_ffi::rustls_result {
263+
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_add_pem(a0, a1, a2, a3)
264264
}
265265
unsafe fn f34(
266266
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
267267
a1: *mut *const ::rustls_ffi::certificate::rustls_root_cert_store,
268-
) -> u32 {
268+
) -> ::rustls_ffi::rustls_result {
269269
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_build(
270270
a0, a1,
271-
) as u32
271+
)
272272
}
273273
unsafe fn f35(a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder) {
274274
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_free(
@@ -279,8 +279,8 @@ unsafe fn f36(
279279
a0: *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder,
280280
a1: *const u8,
281281
a2: bool,
282-
) -> u32 {
283-
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_load_roots_from_file(a0, a1 as *const ::std::ffi::c_char, a2) as u32
282+
) -> ::rustls_ffi::rustls_result {
283+
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_load_roots_from_file(a0, a1 as *const ::std::ffi::c_char, a2)
284284
}
285285
unsafe fn f37() -> *mut ::rustls_ffi::certificate::rustls_root_cert_store_builder {
286286
::rustls_ffi::certificate::rustls_root_cert_store_builder::rustls_root_cert_store_builder_new()
@@ -292,22 +292,23 @@ unsafe fn f38(a0: *const ::rustls_ffi::certificate::rustls_root_cert_store) {
292292
unsafe fn f39(
293293
a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder,
294294
a1: *mut *const ::rustls_ffi::crypto_provider::rustls_crypto_provider,
295-
) -> u32 {
296-
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_build(a0, a1) as u32
295+
) -> ::rustls_ffi::rustls_result {
296+
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_build(a0, a1)
297297
}
298298
unsafe fn f40(a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder) {
299299
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_free(a0)
300300
}
301-
unsafe fn f41(a0: *mut *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder) -> u32 {
302-
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_new_from_default(a0) as u32
301+
unsafe fn f41(
302+
a0: *mut *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder,
303+
) -> ::rustls_ffi::rustls_result {
304+
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_new_from_default(a0)
303305
}
304306
unsafe fn f42(
305307
a0: *mut ::rustls_ffi::crypto_provider::rustls_crypto_provider_builder,
306308
a1: *const *const ::rustls_ffi::cipher::rustls_supported_ciphersuite,
307309
a2: usize,
308-
) -> u32 {
310+
) -> ::rustls_ffi::rustls_result {
309311
::rustls_ffi::crypto_provider::rustls_crypto_provider_builder_set_cipher_suites(a0, a1, a2)
310-
as u32
311312
}
312313
unsafe fn f43(a0: *const ::rustls_ffi::crypto_provider::rustls_crypto_provider) {
313314
::rustls_ffi::crypto_provider::rustls_crypto_provider_free(a0)
@@ -318,13 +319,14 @@ unsafe fn f44(a0: usize) -> *const ::rustls_ffi::cipher::rustls_supported_cipher
318319
unsafe fn f45() -> usize {
319320
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_ciphersuites_len()
320321
}
321-
unsafe fn f46(a0: *mut u8, a1: usize) -> u32 {
322-
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_random(a0, a1) as u32
322+
unsafe fn f46(a0: *mut u8, a1: usize) -> ::rustls_ffi::rustls_result {
323+
::rustls_ffi::crypto_provider::rustls_default_crypto_provider_random(a0, a1)
323324
}
324325

325-
unsafe fn f47(a0: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier) -> u32 {
326+
unsafe fn f47(
327+
a0: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier,
328+
) -> ::rustls_ffi::rustls_result {
326329
::rustls_ffi::verifier::rustls_server_cert_verifier::rustls_platform_server_cert_verifier(a0)
327-
as u32
328330
}
329331
unsafe fn f48(a0: *mut ::rustls_ffi::verifier::rustls_server_cert_verifier) {
330332
::rustls_ffi::verifier::rustls_server_cert_verifier::rustls_server_cert_verifier_free(a0)
@@ -333,27 +335,27 @@ unsafe fn f49(
333335
a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
334336
a1: *const u8,
335337
a2: usize,
336-
) -> u32 {
338+
) -> ::rustls_ffi::rustls_result {
337339
unsafe extern "C" {
338340
fn rustls_web_pki_server_cert_verifier_builder_add_crl(
339341
builder: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
340342
crl_pem: *const u8,
341343
crl_pem_len: usize,
342344
) -> ::rustls_ffi::rustls_result;
343345
}
344-
rustls_web_pki_server_cert_verifier_builder_add_crl(a0, a1, a2) as u32
346+
rustls_web_pki_server_cert_verifier_builder_add_crl(a0, a1, a2)
345347
}
346348
unsafe fn f50(
347349
a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
348350
a1: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier,
349-
) -> u32 {
351+
) -> ::rustls_ffi::rustls_result {
350352
unsafe extern "C" {
351353
fn rustls_web_pki_server_cert_verifier_builder_build(
352354
builder: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder,
353355
verifier_out: *mut *mut ::rustls_ffi::verifier::rustls_server_cert_verifier,
354356
) -> ::rustls_ffi::rustls_result;
355357
}
356-
rustls_web_pki_server_cert_verifier_builder_build(a0, a1) as u32
358+
rustls_web_pki_server_cert_verifier_builder_build(a0, a1)
357359
}
358360
unsafe fn f51(a0: *mut ::rustls_ffi::verifier::rustls_web_pki_server_cert_verifier_builder) {
359361
unsafe extern "C" {
@@ -426,7 +428,7 @@ unsafe fn f60(
426428
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
427429
a1: unsafe fn(::rustls_ffi::rslice::rustls_str<'static>, *const u8, usize, *const u8, usize),
428430
a2: Option<unsafe fn(::rustls_ffi::rslice::rustls_str<'static>) -> i32>,
429-
) -> u32 {
431+
) -> ::rustls_ffi::rustls_result {
430432
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_set_key_log(
431433
a0,
432434
std::mem::transmute::<*const (), ::rustls_ffi::keylog::rustls_keylog_log_callback>(
@@ -436,19 +438,19 @@ unsafe fn f60(
436438
Option<unsafe fn(::rustls_ffi::rslice::rustls_str<'static>) -> i32>,
437439
::rustls_ffi::keylog::rustls_keylog_will_log_callback,
438440
>(a2),
439-
) as u32
441+
)
440442
}
441443
unsafe fn f61(
442444
a0: *mut ::rustls_ffi::client::rustls_client_config_builder,
443445
a1: unsafe fn(
444446
*mut ::libc::c_void,
445447
*const ::rustls_ffi::client::rustls_verify_server_cert_params<'static>,
446-
) -> u32,
447-
) -> u32 {
448+
) -> ::rustls_ffi::rustls_result,
449+
) -> ::rustls_ffi::rustls_result {
448450
::rustls_ffi::client::rustls_client_config_builder::rustls_client_config_builder_dangerous_set_certificate_verifier(
449451
a0,
450452
std::mem::transmute::<*const (), ::rustls_ffi::client::rustls_verify_server_cert_callback>(
451453
a1 as *const (),
452454
),
453-
) as u32
455+
)
454456
}

0 commit comments

Comments
 (0)