Skip to content

Commit 15cf852

Browse files
committed
Bump deranged and fix breakage
1 parent b6d74b5 commit 15cf852

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

Cargo.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -892,9 +892,9 @@ dependencies = [
892892

893893
[[package]]
894894
name = "deranged"
895-
version = "0.4.0"
895+
version = "0.4.1"
896896
source = "registry+https://github.com/rust-lang/crates.io-index"
897-
checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
897+
checksum = "28cfac68e08048ae1883171632c2aef3ebc555621ae56fbccce1cbf22dd7f058"
898898
dependencies = [
899899
"powerfmt",
900900
]

src/tools/clippy/clippy_lints/src/loops/needless_range_loop.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ fn is_end_eq_array_len<'tcx>(
210210
&& let Some(arr_len) = arr_len_const.try_to_target_usize(cx.tcx)
211211
{
212212
return match limits {
213-
ast::RangeLimits::Closed => end_int.get() + 1 >= arr_len.into(),
214-
ast::RangeLimits::HalfOpen => end_int.get() >= arr_len.into(),
213+
ast::RangeLimits::Closed => end_int.get() + 1 >= u128::from(arr_len),
214+
ast::RangeLimits::HalfOpen => end_int.get() >= u128::from(arr_len),
215215
};
216216
}
217217

src/tools/miri/src/shims/unix/macos/sync.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
169169
return interp_ok(());
170170
}
171171

172-
if futex_val == value.into() {
172+
if futex_val == u128::from(value) {
173173
// If the values are the same, we have to block.
174174
let futex_ref = futex.futex.clone();
175175
let dest = dest.clone();

src/tools/rust-analyzer/crates/proc-macro-srv/src/server_impl/rust_analyzer_span.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ impl server::Span for RaSpanServer {
336336
if span.anchor.ast_id == FIXUP_ERASED_FILE_AST_ID_MARKER {
337337
return Some(span);
338338
}
339-
let length = span.range.len().into();
339+
let length: u32 = span.range.len().into();
340340

341341
let start: u32 = match start {
342342
Bound::Included(lo) => lo,
@@ -355,7 +355,7 @@ impl server::Span for RaSpanServer {
355355
.ok()?;
356356

357357
// Bounds check the values, preventing addition overflow and OOB spans.
358-
let span_start = span.range.start().into();
358+
let span_start: u32 = span.range.start().into();
359359
if (u32::MAX - start) < span_start
360360
|| (u32::MAX - end) < span_start
361361
|| start >= end

tests/ui-fulldeps/stable-mir/check_abi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fn check_niche(abi: &ArgAbi) {
127127
let Scalar::Initialized { value, valid_range } = scalar else { unreachable!() };
128128
assert_matches!(value, Primitive::Int { length: IntegerLength::I8, signed: false });
129129
assert_eq!(valid_range.start, 1);
130-
assert_eq!(valid_range.end, u8::MAX.into());
130+
assert_eq!(valid_range.end, u128::from(u8::MAX));
131131
assert!(!valid_range.contains(0));
132132
assert!(!valid_range.wraps_around());
133133
}

0 commit comments

Comments
 (0)