From 3bbac47098661d344f87421532fc1b7866be56fd Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sat, 23 Jul 2022 14:01:12 -0700 Subject: [PATCH] Remove unneeded integer suffixes --- src/api.rs | 8 +++---- src/emitter.rs | 12 +++++----- src/reader.rs | 62 +++++++++++++++++++++++++------------------------- src/scanner.rs | 27 ++++++++++------------ src/writer.rs | 12 +++++----- 5 files changed, 59 insertions(+), 62 deletions(-) diff --git a/src/api.rs b/src/api.rs index a34acad..a5d18a2 100644 --- a/src/api.rs +++ b/src/api.rs @@ -620,10 +620,10 @@ unsafe fn yaml_check_utf8(start: *const yaml_char_t, length: size_t) -> Success value = (value << 6).wrapping_add((octet as libc::c_int & 0x3F) as libc::c_uint); k = k.wrapping_add(1); } - if !(width == 1_u32 - || width == 2_u32 && value >= 0x80_u32 - || width == 3_u32 && value >= 0x800_u32 - || width == 4_u32 && value >= 0x10000_u32) + if !(width == 1 + || width == 2 && value >= 0x80 + || width == 3 && value >= 0x800 + || width == 4 && value >= 0x10000) { return FAIL; } diff --git a/src/emitter.rs b/src/emitter.rs index df045e8..89f6837 100644 --- a/src/emitter.rs +++ b/src/emitter.rs @@ -2206,23 +2206,23 @@ unsafe fn yaml_emitter_write_double_quoted_scalar( } } _ => { - if value_0 <= 0xFF_u32 { + if value_0 <= 0xFF { if PUT(emitter, b'x').fail { return FAIL; } - width = 2_u32; - } else if value_0 <= 0xFFFF_u32 { + width = 2; + } else if value_0 <= 0xFFFF { if PUT(emitter, b'u').fail { return FAIL; } - width = 4_u32; + width = 4; } else { if PUT(emitter, b'U').fail { return FAIL; } - width = 8_u32; + width = 8; } - k = width.wrapping_sub(1_u32).wrapping_mul(4_u32) as libc::c_int; + k = width.wrapping_sub(1).wrapping_mul(4) as libc::c_int; while k >= 0 { let digit: libc::c_int = (value_0 >> k & 0x0F) as libc::c_int; if PUT( diff --git a/src/reader.rs b/src/reader.rs index 5c956b2..25d9bcc 100644 --- a/src/reader.rs +++ b/src/reader.rs @@ -196,11 +196,11 @@ pub(crate) unsafe fn yaml_parser_update_buffer( } first = 0; while (*parser).raw_buffer.pointer != (*parser).raw_buffer.last { - let mut value: libc::c_uint = 0_u32; + let mut value: libc::c_uint = 0; let value2: libc::c_uint; let mut incomplete: libc::c_int = 0; let mut octet: libc::c_uchar; - let mut width: libc::c_uint = 0_u32; + let mut width: libc::c_uint = 0; let low: libc::c_int; let high: libc::c_int; let mut k: size_t; @@ -270,10 +270,10 @@ pub(crate) unsafe fn yaml_parser_update_buffer( .wrapping_add((octet as libc::c_int & 0x3F) as libc::c_uint); k = k.wrapping_add(1); } - if !(width == 1_u32 - || width == 2_u32 && value >= 0x80_u32 - || width == 3_u32 && value >= 0x800_u32 - || width == 4_u32 && value >= 0x10000_u32) + if !(width == 1 + || width == 2 && value >= 0x80 + || width == 3 && value >= 0x800 + || width == 4 && value >= 0x10000) { return yaml_parser_set_reader_error( parser, @@ -283,7 +283,7 @@ pub(crate) unsafe fn yaml_parser_update_buffer( -1, ); } - if value >= 0xD800_u32 && value <= 0xDFFF_u32 || value > 0x10FFFF_u32 { + if value >= 0xD800 && value <= 0xDFFF || value > 0x10FFFF { return yaml_parser_set_reader_error( parser, b"invalid Unicode character\0" as *const u8 as *const libc::c_char, @@ -325,7 +325,7 @@ pub(crate) unsafe fn yaml_parser_update_buffer( + ((*(*parser).raw_buffer.pointer.wrapping_offset(high as isize) as libc::c_int) << 8)) as libc::c_uint; - if value & 0xFC00_u32 == 0xDC00_u32 { + if value & 0xFC00 == 0xDC00 { return yaml_parser_set_reader_error( parser, b"unexpected low surrogate area\0" as *const u8 @@ -334,8 +334,8 @@ pub(crate) unsafe fn yaml_parser_update_buffer( value as libc::c_int, ); } - if value & 0xFC00_u32 == 0xD800_u32 { - width = 4_u32; + if value & 0xFC00 == 0xD800 { + width = 4; if raw_unread < 4_u64 { if (*parser).eof != 0 { return yaml_parser_set_reader_error( @@ -360,7 +360,7 @@ pub(crate) unsafe fn yaml_parser_update_buffer( as libc::c_int) << 8)) as libc::c_uint; - if value2 & 0xFC00_u32 != 0xDC00_u32 { + if value2 & 0xFC00 != 0xDC00 { return yaml_parser_set_reader_error( parser, b"expected low surrogate area\0" as *const u8 @@ -370,11 +370,11 @@ pub(crate) unsafe fn yaml_parser_update_buffer( ); } value = 0x10000_u32 - .wrapping_add((value & 0x3FF_u32) << 10) - .wrapping_add(value2 & 0x3FF_u32); + .wrapping_add((value & 0x3FF) << 10) + .wrapping_add(value2 & 0x3FF); } } else { - width = 2_u32; + width = 2; } } } @@ -383,14 +383,14 @@ pub(crate) unsafe fn yaml_parser_update_buffer( if incomplete != 0 { break; } - if !(value == 0x9_u32 - || value == 0xA_u32 - || value == 0xD_u32 - || value >= 0x20_u32 && value <= 0x7E_u32 - || value == 0x85_u32 - || value >= 0xA0_u32 && value <= 0xD7FF_u32 - || value >= 0xE000_u32 && value <= 0xFFFD_u32 - || value >= 0x10000_u32 && value <= 0x10FFFF_u32) + if !(value == 0x9 + || value == 0xA + || value == 0xD + || value >= 0x20 && value <= 0x7E + || value == 0x85 + || value >= 0xA0 && value <= 0xD7FF + || value >= 0xE000 && value <= 0xFFFD + || value >= 0x10000 && value <= 0x10FFFF) { return yaml_parser_set_reader_error( parser, @@ -404,12 +404,12 @@ pub(crate) unsafe fn yaml_parser_update_buffer( let fresh15 = addr_of_mut!((*parser).offset); *fresh15 = (*fresh15 as libc::c_ulong).wrapping_add(width as libc::c_ulong) as size_t as size_t; - if value <= 0x7F_u32 { + if value <= 0x7F { let fresh16 = addr_of_mut!((*parser).buffer.last); let fresh17 = *fresh16; *fresh16 = (*fresh16).wrapping_offset(1); *fresh17 = value as yaml_char_t; - } else if value <= 0x7FF_u32 { + } else if value <= 0x7FF { let fresh18 = addr_of_mut!((*parser).buffer.last); let fresh19 = *fresh18; *fresh18 = (*fresh18).wrapping_offset(1); @@ -417,8 +417,8 @@ pub(crate) unsafe fn yaml_parser_update_buffer( let fresh20 = addr_of_mut!((*parser).buffer.last); let fresh21 = *fresh20; *fresh20 = (*fresh20).wrapping_offset(1); - *fresh21 = 0x80_u32.wrapping_add(value & 0x3F_u32) as yaml_char_t; - } else if value <= 0xFFFF_u32 { + *fresh21 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; + } else if value <= 0xFFFF { let fresh22 = addr_of_mut!((*parser).buffer.last); let fresh23 = *fresh22; *fresh22 = (*fresh22).wrapping_offset(1); @@ -426,11 +426,11 @@ pub(crate) unsafe fn yaml_parser_update_buffer( let fresh24 = addr_of_mut!((*parser).buffer.last); let fresh25 = *fresh24; *fresh24 = (*fresh24).wrapping_offset(1); - *fresh25 = 0x80_u32.wrapping_add(value >> 6 & 0x3F_u32) as yaml_char_t; + *fresh25 = 0x80_u32.wrapping_add(value >> 6 & 0x3F) as yaml_char_t; let fresh26 = addr_of_mut!((*parser).buffer.last); let fresh27 = *fresh26; *fresh26 = (*fresh26).wrapping_offset(1); - *fresh27 = 0x80_u32.wrapping_add(value & 0x3F_u32) as yaml_char_t; + *fresh27 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; } else { let fresh28 = addr_of_mut!((*parser).buffer.last); let fresh29 = *fresh28; @@ -439,15 +439,15 @@ pub(crate) unsafe fn yaml_parser_update_buffer( let fresh30 = addr_of_mut!((*parser).buffer.last); let fresh31 = *fresh30; *fresh30 = (*fresh30).wrapping_offset(1); - *fresh31 = 0x80_u32.wrapping_add(value >> 12 & 0x3F_u32) as yaml_char_t; + *fresh31 = 0x80_u32.wrapping_add(value >> 12 & 0x3F) as yaml_char_t; let fresh32 = addr_of_mut!((*parser).buffer.last); let fresh33 = *fresh32; *fresh32 = (*fresh32).wrapping_offset(1); - *fresh33 = 0x80_u32.wrapping_add(value >> 6 & 0x3F_u32) as yaml_char_t; + *fresh33 = 0x80_u32.wrapping_add(value >> 6 & 0x3F) as yaml_char_t; let fresh34 = addr_of_mut!((*parser).buffer.last); let fresh35 = *fresh34; *fresh34 = (*fresh34).wrapping_offset(1); - *fresh35 = 0x80_u32.wrapping_add(value & 0x3F_u32) as yaml_char_t; + *fresh35 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; } let fresh36 = addr_of_mut!((*parser).unread); *fresh36 = (*fresh36).wrapping_add(1); diff --git a/src/scanner.rs b/src/scanner.rs index 4e37a7e..4b2ce8b 100644 --- a/src/scanner.rs +++ b/src/scanner.rs @@ -2578,7 +2578,7 @@ unsafe fn yaml_parser_scan_flow_scalar( SKIP(parser); SKIP(parser); if code_length != 0 { - let mut value: libc::c_uint = 0_u32; + let mut value: libc::c_uint = 0; let mut k: size_t; if CACHE(parser, code_length).fail { current_block = 8114179180390253173; @@ -2608,8 +2608,8 @@ unsafe fn yaml_parser_scan_flow_scalar( k = k.wrapping_add(1); } } - if value >= 0xD800_u32 && value <= 0xDFFF_u32 - || value > 0x10FFFF_u32 + if value >= 0xD800 && value <= 0xDFFF + || value > 0x10FFFF { yaml_parser_set_scanner_error( parser, @@ -2623,12 +2623,12 @@ unsafe fn yaml_parser_scan_flow_scalar( current_block = 8114179180390253173; break 's_58; } else { - if value <= 0x7F_u32 { + if value <= 0x7F { let fresh573 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); *fresh573 = value as yaml_char_t; - } else if value <= 0x7FF_u32 { + } else if value <= 0x7FF { let fresh574 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); @@ -2637,10 +2637,9 @@ unsafe fn yaml_parser_scan_flow_scalar( let fresh575 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); - *fresh575 = 0x80_u32 - .wrapping_add(value & 0x3F_u32) + *fresh575 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; - } else if value <= 0xFFFF_u32 { + } else if value <= 0xFFFF { let fresh576 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); @@ -2650,13 +2649,12 @@ unsafe fn yaml_parser_scan_flow_scalar( string.pointer = string.pointer.wrapping_offset(1); *fresh577 = 0x80_u32 - .wrapping_add(value >> 6 & 0x3F_u32) + .wrapping_add(value >> 6 & 0x3F) as yaml_char_t; let fresh578 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); - *fresh578 = 0x80_u32 - .wrapping_add(value & 0x3F_u32) + *fresh578 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; } else { let fresh579 = string.pointer; @@ -2668,19 +2666,18 @@ unsafe fn yaml_parser_scan_flow_scalar( string.pointer = string.pointer.wrapping_offset(1); *fresh580 = 0x80_u32 - .wrapping_add(value >> 12 & 0x3F_u32) + .wrapping_add(value >> 12 & 0x3F) as yaml_char_t; let fresh581 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); *fresh581 = 0x80_u32 - .wrapping_add(value >> 6 & 0x3F_u32) + .wrapping_add(value >> 6 & 0x3F) as yaml_char_t; let fresh582 = string.pointer; string.pointer = string.pointer.wrapping_offset(1); - *fresh582 = 0x80_u32 - .wrapping_add(value & 0x3F_u32) + *fresh582 = 0x80_u32.wrapping_add(value & 0x3F) as yaml_char_t; } k = 0_u64; diff --git a/src/writer.rs b/src/writer.rs index 5b526ac..c0becd6 100644 --- a/src/writer.rs +++ b/src/writer.rs @@ -98,28 +98,28 @@ pub unsafe fn yaml_emitter_flush(emitter: *mut yaml_emitter_t) -> Success { } let fresh5 = addr_of_mut!((*emitter).buffer.pointer); *fresh5 = (*fresh5).wrapping_offset(width as isize); - if value < 0x10000_u32 { + if value < 0x10000 { *(*emitter).raw_buffer.last.wrapping_offset(high as isize) = (value >> 8) as libc::c_uchar; *(*emitter).raw_buffer.last.wrapping_offset(low as isize) = - (value & 0xFF_u32) as libc::c_uchar; + (value & 0xFF) as libc::c_uchar; let fresh6 = addr_of_mut!((*emitter).raw_buffer.last); *fresh6 = (*fresh6).wrapping_offset(2_isize); } else { - value = value.wrapping_sub(0x10000_u32); + value = value.wrapping_sub(0x10000); *(*emitter).raw_buffer.last.wrapping_offset(high as isize) = 0xD8_u32.wrapping_add(value >> 18) as libc::c_uchar; *(*emitter).raw_buffer.last.wrapping_offset(low as isize) = - (value >> 10 & 0xFF_u32) as libc::c_uchar; + (value >> 10 & 0xFF) as libc::c_uchar; *(*emitter) .raw_buffer .last .wrapping_offset((high + 2) as isize) = - 0xDC_u32.wrapping_add(value >> 8 & 0xFF_u32) as libc::c_uchar; + 0xDC_u32.wrapping_add(value >> 8 & 0xFF) as libc::c_uchar; *(*emitter) .raw_buffer .last - .wrapping_offset((low + 2) as isize) = (value & 0xFF_u32) as libc::c_uchar; + .wrapping_offset((low + 2) as isize) = (value & 0xFF) as libc::c_uchar; let fresh7 = addr_of_mut!((*emitter).raw_buffer.last); *fresh7 = (*fresh7).wrapping_offset(4_isize); }