Skip to content

Commit ba457db

Browse files
committed
remove extraneous return
1 parent 3007c11 commit ba457db

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

crates/bevy_ecs/src/storage/sparse_set.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ impl ComponentSparseSet {
324324
let is_last = dense_index.as_usize() == last_index;
325325
self.entities.swap_remove(dense_index.as_usize());
326326
// SAFETY: dense_index was just removed from `sparse`, which ensures that it is valid
327-
let (value, _, _) = unsafe {
327+
let value = unsafe {
328328
self.dense
329329
.swap_remove_and_forget_unchecked(last_index, dense_index)
330330
};

crates/bevy_ecs/src/storage/table/column.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,23 @@ impl ThinColumn {
9595
&mut self,
9696
last_element_index: usize,
9797
row: TableRow,
98-
) -> (OwningPtr, ComponentTicks, MaybeLocation) {
98+
) -> OwningPtr {
9999
let data = self
100100
.data
101101
.swap_remove_unchecked(row.as_usize(), last_element_index);
102-
let added = self
103-
.added_ticks
102+
self.added_ticks
104103
.swap_remove_unchecked(row.as_usize(), last_element_index)
105104
.read();
106-
let changed = self
107-
.changed_ticks
105+
self.changed_ticks
108106
.swap_remove_unchecked(row.as_usize(), last_element_index)
109107
.read();
110-
let changed_by = self.changed_by.as_mut().map(|changed_by| {
108+
self.changed_by.as_mut().map(|changed_by| {
111109
changed_by
112110
.swap_remove_unchecked(row.as_usize(), last_element_index)
113111
.read()
114112
});
115113

116-
(data, ComponentTicks { added, changed }, changed_by)
114+
data
117115
}
118116

119117
/// Call [`realloc`](std::alloc::realloc) to expand / shrink the memory allocation for this [`ThinColumn`]

0 commit comments

Comments
 (0)