Skip to content

Commit 393878b

Browse files
committed
remove redundant return value Ok(()) of clear_relocations()
1 parent 85bd00f commit 393878b

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

compiler/rustc_middle/src/mir/interpret/allocation.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ impl<'tcx, Tag: Copy, Extra: AllocationExtra<Tag>> Allocation<Tag, Extra> {
266266
let range = self.check_bounds(ptr.offset, size);
267267

268268
self.mark_init(ptr, size, true);
269-
self.clear_relocations(cx, ptr, size)?;
269+
self.clear_relocations(cx, ptr, size);
270270

271271
AllocationExtra::memory_written(self, ptr, size)?;
272272

@@ -484,18 +484,13 @@ impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
484484
/// uninitialized. This is a somewhat odd "spooky action at a distance",
485485
/// but it allows strictly more code to run than if we would just error
486486
/// immediately in that case.
487-
fn clear_relocations(
488-
&mut self,
489-
cx: &impl HasDataLayout,
490-
ptr: Pointer<Tag>,
491-
size: Size,
492-
) -> InterpResult<'tcx> {
487+
fn clear_relocations(&mut self, cx: &impl HasDataLayout, ptr: Pointer<Tag>, size: Size) {
493488
// Find the start and end of the given range and its outermost relocations.
494489
let (first, last) = {
495490
// Find all relocations overlapping the given range.
496491
let relocations = self.get_relocations(cx, ptr, size);
497492
if relocations.is_empty() {
498-
return Ok(());
493+
return;
499494
}
500495

501496
(
@@ -517,8 +512,6 @@ impl<'tcx, Tag: Copy, Extra> Allocation<Tag, Extra> {
517512

518513
// Forget all the relocations.
519514
self.relocations.remove_range(first..last);
520-
521-
Ok(())
522515
}
523516

524517
/// Errors if there are relocations overlapping with the edges of the

0 commit comments

Comments
 (0)