diff --git a/Cargo.lock b/Cargo.lock
index 4e4590344..3d3945b3f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -563,7 +563,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-casm"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-utils",
  "indoc",
@@ -576,7 +576,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-compiler"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-defs",
@@ -601,7 +601,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-debug"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-utils",
 ]
@@ -609,7 +609,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-defs"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-diagnostics",
@@ -625,7 +625,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-diagnostics"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -636,22 +636,27 @@ dependencies = [
 [[package]]
 name = "cairo-lang-doc"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
+ "cairo-lang-debug",
  "cairo-lang-defs",
+ "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
  "cairo-lang-formatter",
  "cairo-lang-parser",
+ "cairo-lang-semantic",
  "cairo-lang-syntax",
  "cairo-lang-utils",
  "itertools 0.12.1",
+ "pulldown-cmark",
  "rust-analyzer-salsa",
+ "smol_str",
 ]
 
 [[package]]
 name = "cairo-lang-eq-solver"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-utils",
  "good_lp",
@@ -660,7 +665,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-filesystem"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-utils",
@@ -675,7 +680,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-formatter"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-diagnostics",
@@ -694,7 +699,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-language-server"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -734,7 +739,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-lowering"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -799,7 +804,7 @@ checksum = "c49906d6b1c215e5814be7c5c65ecf2328898b335bee8c2409ec07cfb5530daf"
 [[package]]
 name = "cairo-lang-parser"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-diagnostics",
  "cairo-lang-filesystem",
@@ -818,7 +823,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-plugins"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-defs",
  "cairo-lang-diagnostics",
@@ -836,7 +841,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-proc-macros"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "quote",
@@ -846,7 +851,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-project"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-filesystem",
  "cairo-lang-utils",
@@ -855,22 +860,37 @@ dependencies = [
  "toml",
 ]
 
+[[package]]
+name = "cairo-lang-runnable-utils"
+version = "2.8.4"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
+dependencies = [
+ "cairo-lang-casm",
+ "cairo-lang-sierra",
+ "cairo-lang-sierra-ap-change",
+ "cairo-lang-sierra-gas",
+ "cairo-lang-sierra-to-casm",
+ "cairo-lang-sierra-type-size",
+ "cairo-lang-utils",
+ "cairo-vm",
+ "itertools 0.12.1",
+ "thiserror",
+]
+
 [[package]]
 name = "cairo-lang-runner"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "ark-ff",
  "ark-secp256k1",
  "ark-secp256r1",
  "cairo-lang-casm",
  "cairo-lang-lowering",
+ "cairo-lang-runnable-utils",
  "cairo-lang-sierra",
- "cairo-lang-sierra-ap-change",
- "cairo-lang-sierra-gas",
  "cairo-lang-sierra-generator",
  "cairo-lang-sierra-to-casm",
- "cairo-lang-sierra-type-size",
  "cairo-lang-starknet",
  "cairo-lang-utils",
  "cairo-vm",
@@ -889,7 +909,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-semantic"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -914,7 +934,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-utils",
@@ -940,7 +960,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-ap-change"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -955,7 +975,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-gas"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-eq-solver",
  "cairo-lang-sierra",
@@ -970,7 +990,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-generator"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-defs",
@@ -993,7 +1013,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-to-casm"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "assert_matches",
  "cairo-lang-casm",
@@ -1013,7 +1033,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-sierra-type-size"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-sierra",
  "cairo-lang-utils",
@@ -1022,7 +1042,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1051,7 +1071,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-starknet-classes"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-casm",
  "cairo-lang-sierra",
@@ -1073,7 +1093,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-debug",
  "cairo-lang-filesystem",
@@ -1088,7 +1108,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-syntax-codegen"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "genco",
  "xshell",
@@ -1097,7 +1117,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-plugin"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1123,7 +1143,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-runner"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "anyhow",
  "cairo-lang-compiler",
@@ -1145,7 +1165,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-test-utils"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "cairo-lang-formatter",
  "cairo-lang-utils",
@@ -1157,7 +1177,7 @@ dependencies = [
 [[package]]
 name = "cairo-lang-utils"
 version = "2.8.4"
-source = "git+https://github.com/starkware-libs/cairo?rev=5e447a6bec62eadc97af00d84b74e3b435bff723#5e447a6bec62eadc97af00d84b74e3b435bff723"
+source = "git+https://github.com/starkware-libs/cairo?rev=3874879adcc2f36d7e1235fc9aec8420ff7013b0#3874879adcc2f36d7e1235fc9aec8420ff7013b0"
 dependencies = [
  "env_logger",
  "hashbrown 0.14.5",
@@ -2085,6 +2105,15 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "getopts"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
+dependencies = [
+ "unicode-width",
+]
+
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -4404,6 +4433,25 @@ dependencies = [
  "parking_lot",
 ]
 
+[[package]]
+name = "pulldown-cmark"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"
+dependencies = [
+ "bitflags 2.5.0",
+ "getopts",
+ "memchr",
+ "pulldown-cmark-escape",
+ "unicase",
+]
+
+[[package]]
+name = "pulldown-cmark-escape"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "007d8adb5ddab6f8e3f491ac63566a7d5002cc7ed73901f72057943fa71ae1ae"
+
 [[package]]
 name = "quote"
 version = "1.0.37"
diff --git a/Cargo.toml b/Cargo.toml
index de59d0d13..59b223104 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,30 +35,30 @@ anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
-cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "5e447a6bec62eadc97af00d84b74e3b435bff723", features = ["env_logger"] }
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-debug = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-diagnostics = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-doc = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-lowering = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-parser = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-project = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-sierra-generator = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-sierra-type-size = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-starknet-classes = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-syntax = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "3874879adcc2f36d7e1235fc9aec8420ff7013b0", features = ["env_logger"] }
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = ">=0.18"
 clap = { version = "4", features = ["derive", "env", "string"] }
diff --git a/extensions/scarb-cairo-run/src/main.rs b/extensions/scarb-cairo-run/src/main.rs
index 4a935a593..331636176 100644
--- a/extensions/scarb-cairo-run/src/main.rs
+++ b/extensions/scarb-cairo-run/src/main.rs
@@ -144,7 +144,7 @@ fn main_inner(ui: &Ui, args: Args) -> Result<()> {
     let result = runner
         .run_function_with_starknet_context(
             main_function(&runner, &sierra_program, args.function.as_deref())?,
-            &program_args,
+            program_args.into(),
             available_gas.value(),
             StarknetState::default(),
         )
diff --git a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package-test.md b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package-test.md
index 269a52e19..320cbefb8 100644
--- a/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package-test.md
+++ b/extensions/scarb-doc/tests/data/hello_world_sub_package_with_features/src/hello_world_sub_package-test.md
@@ -6,6 +6,7 @@ Function that prints "test" to stdout with endline. Can invoke it like that:
         test();
     }
 ```
+This is a under feature attribute comment.
 
 Fully qualified path: `hello_world_sub_package::test`
 
diff --git a/extensions/scarb-doc/tests/data/json_private_items_excluded.json b/extensions/scarb-doc/tests/data/json_private_items_excluded.json
index 8ebfc997d..8052ee999 100644
--- a/extensions/scarb-doc/tests/data/json_private_items_excluded.json
+++ b/extensions/scarb-doc/tests/data/json_private_items_excluded.json
@@ -52,7 +52,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -61,7 +61,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure"
                       }
                     }
@@ -81,7 +81,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -99,7 +99,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum"
                       }
                     }
@@ -144,7 +144,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -153,7 +153,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     }
@@ -173,7 +173,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -191,7 +191,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     }
@@ -229,7 +229,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicParent::PublicParentStructure"
                   }
                 },
@@ -238,7 +238,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent publi crate struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicParent::PublicCrateParentStructure"
                   }
                 }
@@ -258,7 +258,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicParent::PublicParentEnum"
                   }
                 },
@@ -276,7 +276,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicParent::PublicCrateParentEnum"
                   }
                 }
@@ -329,7 +329,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -338,7 +338,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure"
                       }
                     }
@@ -358,7 +358,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -376,7 +376,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum"
                       }
                     }
@@ -421,7 +421,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -430,7 +430,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     }
@@ -450,7 +450,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -468,7 +468,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     }
@@ -506,7 +506,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicParentStructure"
                   }
                 },
@@ -515,7 +515,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure"
                   }
                 }
@@ -535,7 +535,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicParentEnum"
                   }
                 },
@@ -553,7 +553,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum"
                   }
                 }
@@ -606,7 +606,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -615,7 +615,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure"
                       }
                     }
@@ -635,7 +635,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -653,7 +653,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum"
                       }
                     }
@@ -698,7 +698,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -707,7 +707,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     }
@@ -727,7 +727,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -745,7 +745,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     }
@@ -783,7 +783,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PrivateParent::PublicParentStructure"
                   }
                 },
@@ -792,7 +792,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PrivateParent::PublicCrateParentStructure"
                   }
                 }
@@ -812,7 +812,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PrivateParent::PublicParentEnum"
                   }
                 },
@@ -830,7 +830,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PrivateParent::PublicCrateParentEnum"
                   }
                 }
@@ -884,7 +884,7 @@
               "item_data": {
                 "name": "PublicStructure",
                 "doc": "Public struct",
-                "signature": "pub struct PublicStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "pub struct PublicStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PublicStructure"
               }
             },
@@ -893,7 +893,7 @@
               "item_data": {
                 "name": "PublicCrateStructure",
                 "doc": "Public crate struct",
-                "signature": "pub(crate) struct PublicCrateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "pub(crate) struct PublicCrateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PublicCrateStructure"
               }
             },
@@ -902,7 +902,7 @@
               "item_data": {
                 "name": "PrivateStructure",
                 "doc": "Private struct",
-                "signature": "struct PrivateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "struct PrivateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PrivateStructure"
               }
             }
@@ -922,7 +922,7 @@
               "item_data": {
                 "name": "PublicEnum",
                 "doc": "Public enum",
-                "signature": "pub enum PublicEnum {\n    PUBLIC_VARIANT\n}",
+                "signature": "pub enum PublicEnum {\n    PUBLIC_VARIANT,\n}",
                 "full_path": "hello_world::PublicEnum"
               }
             },
@@ -940,7 +940,7 @@
               "item_data": {
                 "name": "PublicCrateEnum",
                 "doc": "Public crate enum",
-                "signature": "pub(crate) enum PublicCrateEnum {\n    PUBLIC_VARIANT\n}",
+                "signature": "pub(crate) enum PublicCrateEnum {\n    PUBLIC_VARIANT,\n}",
                 "full_path": "hello_world::PublicCrateEnum"
               }
             },
diff --git a/extensions/scarb-doc/tests/data/json_private_items_included.json b/extensions/scarb-doc/tests/data/json_private_items_included.json
index 58f3afd70..e8e30e39b 100644
--- a/extensions/scarb-doc/tests/data/json_private_items_included.json
+++ b/extensions/scarb-doc/tests/data/json_private_items_included.json
@@ -85,7 +85,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -119,7 +119,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildStructure"
                       }
                     },
@@ -153,7 +153,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PrivateChildStructure"
                       }
                     }
@@ -173,7 +173,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -191,7 +191,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicChild::PublicCrateChildEnum"
                       }
                     },
@@ -287,7 +287,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -321,7 +321,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     },
@@ -355,7 +355,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PrivateChildStructure"
                       }
                     }
@@ -375,7 +375,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -393,7 +393,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     },
@@ -489,7 +489,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PrivateChild::PublicChildStructure"
                       }
                     },
@@ -523,7 +523,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildStructure"
                       }
                     },
@@ -557,7 +557,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicParent::PrivateChild::PrivateChildStructure"
                       }
                     }
@@ -577,7 +577,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PrivateChild::PublicChildEnum"
                       }
                     },
@@ -595,7 +595,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicParent::PrivateChild::PublicCrateChildEnum"
                       }
                     },
@@ -684,7 +684,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicParent::PublicParentStructure"
                   }
                 },
@@ -718,7 +718,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent publi crate struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicParent::PublicCrateParentStructure"
                   }
                 },
@@ -752,7 +752,7 @@
                   "item_data": {
                     "name": "PrivateParentStructure",
                     "doc": "Parent private struct",
-                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicParent::PrivateParentStructure"
                   }
                 }
@@ -772,7 +772,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicParent::PublicParentEnum"
                   }
                 },
@@ -790,7 +790,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicParent::PublicCrateParentEnum"
                   }
                 },
@@ -894,7 +894,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -928,7 +928,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildStructure"
                       }
                     },
@@ -962,7 +962,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PrivateChildStructure"
                       }
                     }
@@ -982,7 +982,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -1000,7 +1000,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicChild::PublicCrateChildEnum"
                       }
                     },
@@ -1096,7 +1096,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -1130,7 +1130,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     },
@@ -1164,7 +1164,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PrivateChildStructure"
                       }
                     }
@@ -1184,7 +1184,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -1202,7 +1202,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     },
@@ -1298,7 +1298,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildStructure"
                       }
                     },
@@ -1332,7 +1332,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildStructure"
                       }
                     },
@@ -1366,7 +1366,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PublicCrateParent::PrivateChild::PrivateChildStructure"
                       }
                     }
@@ -1386,7 +1386,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicChildEnum"
                       }
                     },
@@ -1404,7 +1404,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PublicCrateParent::PrivateChild::PublicCrateChildEnum"
                       }
                     },
@@ -1493,7 +1493,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicParentStructure"
                   }
                 },
@@ -1527,7 +1527,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicCrateParentStructure"
                   }
                 },
@@ -1561,7 +1561,7 @@
                   "item_data": {
                     "name": "PrivateParentStructure",
                     "doc": "Parent private struct",
-                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PublicCrateParent::PrivateParentStructure"
                   }
                 }
@@ -1581,7 +1581,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicParentEnum"
                   }
                 },
@@ -1599,7 +1599,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PublicCrateParent::PublicCrateParentEnum"
                   }
                 },
@@ -1703,7 +1703,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicChildStructure"
                       }
                     },
@@ -1737,7 +1737,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildStructure"
                       }
                     },
@@ -1771,7 +1771,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PrivateChildStructure"
                       }
                     }
@@ -1791,7 +1791,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicChildEnum"
                       }
                     },
@@ -1809,7 +1809,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicChild::PublicCrateChildEnum"
                       }
                     },
@@ -1905,7 +1905,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildStructure"
                       }
                     },
@@ -1939,7 +1939,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildStructure"
                       }
                     },
@@ -1973,7 +1973,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PrivateChildStructure"
                       }
                     }
@@ -1993,7 +1993,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicChildEnum"
                       }
                     },
@@ -2011,7 +2011,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PublicCrateChild::PublicCrateChildEnum"
                       }
                     },
@@ -2107,7 +2107,7 @@
                       "item_data": {
                         "name": "PublicChildStructure",
                         "doc": "Child public struct",
-                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub struct PublicChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildStructure"
                       }
                     },
@@ -2141,7 +2141,7 @@
                       "item_data": {
                         "name": "PublicCrateChildStructure",
                         "doc": "Child public crate struct",
-                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "pub(crate) struct PublicCrateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildStructure"
                       }
                     },
@@ -2175,7 +2175,7 @@
                       "item_data": {
                         "name": "PrivateChildStructure",
                         "doc": "Child private struct",
-                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                        "signature": "struct PrivateChildStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                         "full_path": "hello_world::PrivateParent::PrivateChild::PrivateChildStructure"
                       }
                     }
@@ -2195,7 +2195,7 @@
                       "item_data": {
                         "name": "PublicChildEnum",
                         "doc": "Child public enum",
-                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub enum PublicChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PrivateChild::PublicChildEnum"
                       }
                     },
@@ -2213,7 +2213,7 @@
                       "item_data": {
                         "name": "PublicCrateChildEnum",
                         "doc": "Child public crate enum",
-                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT\n}",
+                        "signature": "pub(crate) enum PublicCrateChildEnum {\n    PUBLIC_VARIANT,\n}",
                         "full_path": "hello_world::PrivateParent::PrivateChild::PublicCrateChildEnum"
                       }
                     },
@@ -2302,7 +2302,7 @@
                   "item_data": {
                     "name": "PublicParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub struct PublicParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PrivateParent::PublicParentStructure"
                   }
                 },
@@ -2336,7 +2336,7 @@
                   "item_data": {
                     "name": "PublicCrateParentStructure",
                     "doc": "Parent public struct",
-                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "pub(crate) struct PublicCrateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PrivateParent::PublicCrateParentStructure"
                   }
                 },
@@ -2370,7 +2370,7 @@
                   "item_data": {
                     "name": "PrivateParentStructure",
                     "doc": "Parent private struct",
-                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                    "signature": "struct PrivateParentStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                     "full_path": "hello_world::PrivateParent::PrivateParentStructure"
                   }
                 }
@@ -2390,7 +2390,7 @@
                   "item_data": {
                     "name": "PublicParentEnum",
                     "doc": "Parent public enum",
-                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub enum PublicParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PrivateParent::PublicParentEnum"
                   }
                 },
@@ -2408,7 +2408,7 @@
                   "item_data": {
                     "name": "PublicCrateParentEnum",
                     "doc": "Parent public crate enum",
-                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT\n}",
+                    "signature": "pub(crate) enum PublicCrateParentEnum {\n    PUBLIC_VARIANT,\n}",
                     "full_path": "hello_world::PrivateParent::PublicCrateParentEnum"
                   }
                 },
@@ -2505,7 +2505,7 @@
               "item_data": {
                 "name": "PublicStructure",
                 "doc": "Public struct",
-                "signature": "pub struct PublicStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "pub struct PublicStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PublicStructure"
               }
             },
@@ -2539,7 +2539,7 @@
               "item_data": {
                 "name": "PublicCrateStructure",
                 "doc": "Public crate struct",
-                "signature": "pub(crate) struct PublicCrateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "pub(crate) struct PublicCrateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PublicCrateStructure"
               }
             },
@@ -2573,7 +2573,7 @@
               "item_data": {
                 "name": "PrivateStructure",
                 "doc": "Private struct",
-                "signature": "struct PrivateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252\n}",
+                "signature": "struct PrivateStructure {\n    pub public_field: felt252,\n    pub(crate) public_crate_field: felt252,\n    private_field: felt252,\n}",
                 "full_path": "hello_world::PrivateStructure"
               }
             }
@@ -2593,7 +2593,7 @@
               "item_data": {
                 "name": "PublicEnum",
                 "doc": "Public enum",
-                "signature": "pub enum PublicEnum {\n    PUBLIC_VARIANT\n}",
+                "signature": "pub enum PublicEnum {\n    PUBLIC_VARIANT,\n}",
                 "full_path": "hello_world::PublicEnum"
               }
             },
@@ -2611,7 +2611,7 @@
               "item_data": {
                 "name": "PublicCrateEnum",
                 "doc": "Public crate enum",
-                "signature": "pub(crate) enum PublicCrateEnum {\n    PUBLIC_VARIANT\n}",
+                "signature": "pub(crate) enum PublicCrateEnum {\n    PUBLIC_VARIANT,\n}",
                 "full_path": "hello_world::PublicCrateEnum"
               }
             },
diff --git a/extensions/scarb-doc/tests/data/json_reexports.json b/extensions/scarb-doc/tests/data/json_reexports.json
index dea645602..88c568bb5 100644
--- a/extensions/scarb-doc/tests/data/json_reexports.json
+++ b/extensions/scarb-doc/tests/data/json_reexports.json
@@ -82,7 +82,7 @@
                       "item_data": {
                         "name": "TestStruct",
                         "doc": null,
-                        "signature": "pub struct TestStruct {\n    abc: u32\n}",
+                        "signature": "pub struct TestStruct {\n    abc: u32,\n}",
                         "full_path": "hello_world::sub_module::inner_module::TestStruct"
                       }
                     }
@@ -102,7 +102,7 @@
                       "item_data": {
                         "name": "TestEnum",
                         "doc": null,
-                        "signature": "pub enum TestEnum {\n    Var1\n}",
+                        "signature": "pub enum TestEnum {\n    Var1,\n}",
                         "full_path": "hello_world::sub_module::inner_module::TestEnum"
                       }
                     }
@@ -238,7 +238,7 @@
                   "item_data": {
                     "name": "TestStruct",
                     "doc": null,
-                    "signature": "pub struct TestStruct {\n    abc: u32\n}",
+                    "signature": "pub struct TestStruct {\n    abc: u32,\n}",
                     "full_path": "hello_world::sub_module::inner_module::TestStruct"
                   }
                 }
@@ -258,7 +258,7 @@
                   "item_data": {
                     "name": "TestEnum",
                     "doc": null,
-                    "signature": "pub enum TestEnum {\n    Var1\n}",
+                    "signature": "pub enum TestEnum {\n    Var1,\n}",
                     "full_path": "hello_world::sub_module::inner_module::TestEnum"
                   }
                 }
@@ -402,7 +402,7 @@
                   "item_data": {
                     "name": "TestStruct",
                     "doc": null,
-                    "signature": "pub struct TestStruct {\n    abc: u32\n}",
+                    "signature": "pub struct TestStruct {\n    abc: u32,\n}",
                     "full_path": "sub_package::TestStruct"
                   }
                 }
@@ -422,7 +422,7 @@
                   "item_data": {
                     "name": "TestEnum",
                     "doc": null,
-                    "signature": "pub enum TestEnum {\n    Var1\n}",
+                    "signature": "pub enum TestEnum {\n    Var1,\n}",
                     "full_path": "sub_package::TestEnum"
                   }
                 }
diff --git a/scarb/tests/fmt.rs b/scarb/tests/fmt.rs
index 43421d99e..44f452b66 100644
--- a/scarb/tests/fmt.rs
+++ b/scarb/tests/fmt.rs
@@ -221,44 +221,47 @@ fn format_with_import_sorting() {
         .current_dir(&t)
         .assert()
         .failure()
-        .stdout_matches(indoc! {"
+        .stdout_matches(indoc! {"\
             Diff in file [..]lib.cairo:
              --- original
             +++ modified
-            @@ -1,10 +1,10 @@
+            @@ -1,21 +1,21 @@
             +use openzeppelin::introspection::first;
              use openzeppelin::introspection::interface;
             -use openzeppelin::introspection::first;
-            
+
              #[starknet::contract]
              mod SRC5 {
                  use openzeppelin::introspection::interface;
             -    use openzeppelin::introspection::{interface, AB};
             +    use openzeppelin::introspection::{AB, interface};
-            
+
                  #[storage]
                  struct Storage {
-            @@ -14,8 +14,8 @@
+            -        supported_interfaces: LegacyMap<felt252, bool>
+            +        supported_interfaces: LegacyMap<felt252, bool>,
+                 }
+
                  use openzeppelin::introspection::first;
-            
+
                  mod A {}
-            +    mod F;
-                 mod G;
-            -    mod F;
-            
+            -    mod G;
+                 mod F;
+            +    mod G;
+
                  #[abi(embed_v0)]
                  impl SRC5Impl of interface::ISRC5<ContractState> {
             @@ -28,7 +28,7 @@
                  use starknet::ArrayTrait;
-            
+
                  mod Inner {
             +        use B;
                      use C;
             -        use B;
                  }
              }
-            
-       "});
+
+        "});
 }
 
 #[test]