Skip to content

Commit 2013b8c

Browse files
GKFXemilio
authored andcommitted
Remove legacy integer methods
1 parent 12215f5 commit 2013b8c

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

bindgen/clang.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2356,18 +2356,18 @@ impl EvalResult {
23562356

23572357
if unsafe { clang_EvalResult_isUnsignedInt(self.x) } != 0 {
23582358
let value = unsafe { clang_EvalResult_getAsUnsigned(self.x) };
2359-
if value > i64::max_value() as c_ulonglong {
2359+
if value > i64::MAX as c_ulonglong {
23602360
return None;
23612361
}
23622362

23632363
return Some(value as i64);
23642364
}
23652365

23662366
let value = unsafe { clang_EvalResult_getAsLongLong(self.x) };
2367-
if value > i64::max_value() as c_longlong {
2367+
if value > i64::MAX as c_longlong {
23682368
return None;
23692369
}
2370-
if value < i64::min_value() as c_longlong {
2370+
if value < i64::MIN as c_longlong {
23712371
return None;
23722372
}
23732373
#[allow(clippy::unnecessary_cast)]

bindgen/ir/var.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,27 +129,23 @@ fn default_macro_constant_type(ctx: &BindgenContext, value: i64) -> IntKind {
129129
ctx.options().default_macro_constant_type ==
130130
MacroTypeVariation::Signed
131131
{
132-
if value < i32::min_value() as i64 || value > i32::max_value() as i64 {
132+
if value < i32::MIN as i64 || value > i32::MAX as i64 {
133133
IntKind::I64
134134
} else if !ctx.options().fit_macro_constants ||
135-
value < i16::min_value() as i64 ||
136-
value > i16::max_value() as i64
135+
value < i16::MIN as i64 ||
136+
value > i16::MAX as i64
137137
{
138138
IntKind::I32
139-
} else if value < i8::min_value() as i64 ||
140-
value > i8::max_value() as i64
141-
{
139+
} else if value < i8::MIN as i64 || value > i8::MAX as i64 {
142140
IntKind::I16
143141
} else {
144142
IntKind::I8
145143
}
146-
} else if value > u32::max_value() as i64 {
144+
} else if value > u32::MAX as i64 {
147145
IntKind::U64
148-
} else if !ctx.options().fit_macro_constants ||
149-
value > u16::max_value() as i64
150-
{
146+
} else if !ctx.options().fit_macro_constants || value > u16::MAX as i64 {
151147
IntKind::U32
152-
} else if value > u8::max_value() as i64 {
148+
} else if value > u8::MAX as i64 {
153149
IntKind::U16
154150
} else {
155151
IntKind::U8
@@ -243,7 +239,7 @@ impl ClangSubItemParser for Var {
243239
c as u8
244240
}
245241
CChar::Raw(c) => {
246-
assert!(c <= ::std::u8::MAX as u64);
242+
assert!(c <= u8::MAX as u64);
247243
c as u8
248244
}
249245
};

0 commit comments

Comments
 (0)