Skip to content

Commit 01fbaae

Browse files
tdelabrokariy
authored andcommitted
use our own is_prime impl (lambdaclass#1238)
1 parent 4942a3c commit 01fbaae

File tree

8 files changed

+6
-229
lines changed

8 files changed

+6
-229
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151

5252
* move the vm in it's own directory and crate, different from the workspace
5353

54-
* add a `ensure_no_std` crate that will be used by the CI to check that new changes are not reverting `no_std` support
54+
* add a `ensure-no_std` crate that will be used by the CI to check that new changes are not reverting `no_std` support
55+
56+
* replace the use of `num-prime::is_prime` by a custom implementation, therefore restoring `no_std` compatibility
5557

5658
#### [0.5.1] - 2023-6-7
5759

ensure-no_std/Cargo.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
[package]
2+
edition = "2021"
23
name = "ensure-no_std"
34
version = "0.1.0"
4-
edition = "2021"
55

66
[dependencies]
7-
cairo-felt = { path = "../felt", default-features = false, features = [
8-
"alloc",
9-
] }
7+
cairo-felt = { path = "../felt", default-features = false, features = [ "alloc" ] }
108
cairo-vm = { path = "../vm", default-features = false }
119

1210
wee_alloc = "0.4.5"

ensure_no_std/.cargo/config.toml

Lines changed: 0 additions & 2 deletions
This file was deleted.

ensure_no_std/Cargo.lock

Lines changed: 0 additions & 181 deletions
This file was deleted.

ensure_no_std/Cargo.toml

Lines changed: 0 additions & 16 deletions
This file was deleted.

ensure_no_std/src/main.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

vm/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ ark-std = { workspace = true, optional = true }
8282
[dev-dependencies]
8383
assert_matches = "1.5.0"
8484
num-prime = { version = "0.4.3", features = [ "big-int" ] }
85+
num-prime = { version = "0.4.3", features = [ "big-int" ] }
8586
rstest = { version = "0.17.0", default-features = false }
8687

8788
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]

vm/src/serde/deserialize_program.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ use crate::{
1616
},
1717
};
1818
use felt::{Felt252, PRIME_STR};
19-
<<<<<<< HEAD:vm/src/serde/deserialize_program.rs
20-
use num_traits::float::FloatCore;
2119
use num_traits::{Num, Pow};
2220
use serde::Serializer;
23-
=======
2421
use num_traits::{Num, Pow};
25-
>>>>>>> 97823e51 (Handle scientific notation in fn `felt_from_number` (#1188)):src/serde/deserialize_program.rs
2622
use serde::{de, de::MapAccess, de::SeqAccess, Deserialize, Deserializer, Serialize};
2723
use serde_json::Number;
2824

0 commit comments

Comments
 (0)