Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove unnecessary casts in BoundedVec #4831

Merged
merged 1 commit into from
Apr 17, 2024
Merged

chore: remove unnecessary casts in BoundedVec #4831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions noir_stdlib/src/collections/bounded_vec.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
}

pub fn get(mut self: Self, index: u64) -> T {
assert(index as u64 < self.len);
assert(index < self.len);
self.storage[index]
}

Expand All @@ -19,7 +19,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
}

pub fn push(&mut self, elem: T) {
assert(self.len < MaxLen as u64, "push out of bounds");
assert(self.len < MaxLen, "push out of bounds");

self.storage[self.len] = elem;
self.len += 1;
Expand All @@ -41,7 +41,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {

pub fn extend_from_array<Len>(&mut self, array: [T; Len]) {
let new_len = self.len + array.len();
assert(new_len as u64 <= MaxLen as u64, "extend_from_array out of bounds");
assert(new_len <= MaxLen, "extend_from_array out of bounds");
for i in 0..array.len() {
self.storage[self.len + i] = array[i];
}
Expand All @@ -50,7 +50,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {

pub fn extend_from_slice(&mut self, slice: [T]) {
let new_len = self.len + slice.len();
assert(new_len as u64 <= MaxLen as u64, "extend_from_slice out of bounds");
assert(new_len <= MaxLen, "extend_from_slice out of bounds");
for i in 0..slice.len() {
self.storage[self.len + i] = slice[i];
}
Expand All @@ -60,7 +60,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
pub fn extend_from_bounded_vec<Len>(&mut self, vec: BoundedVec<T, Len>) {
let append_len = vec.len();
let new_len = self.len + append_len;
assert(new_len as u64 <= MaxLen as u64, "extend_from_bounded_vec out of bounds");
assert(new_len <= MaxLen, "extend_from_bounded_vec out of bounds");

let mut exceeded_len = false;
for i in 0..Len {
Expand All @@ -73,7 +73,7 @@ impl<T, MaxLen> BoundedVec<T, MaxLen> {
}

pub fn pop(&mut self) -> T {
assert(self.len as u64 > 0);
assert(self.len > 0);
self.len -= 1;

let elem = self.storage[self.len];
Expand Down
Loading