Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Clean up dependencies. #28382

Merged
merged 1 commit into from
Oct 10, 2024
Merged

Clean up dependencies. #28382

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
230 changes: 42 additions & 188 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

118 changes: 77 additions & 41 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,74 @@ members = [
"utils/retriever"
]

[workspace.dependencies.leo-ast]
path = "./compiler/ast"
version = "2.3.0"

[workspace.dependencies.leo-compiler]
path = "./compiler/compiler"
version = "2.3.0"

[workspace.dependencies.leo-disassembler]
path = "./utils/disassembler"
version = "2.3.0"

[workspace.dependencies.leo-errors]
path = "./errors"
version = "2.3.0"

[workspace.dependencies.leo-package]
path = "./leo/package"
version = "2.3.0"

[workspace.dependencies.leo-parser]
path = "./compiler/parser"
version = "2.3.0"

[workspace.dependencies.leo-passes]
path = "./compiler/passes"
version = "2.3.0"

[workspace.dependencies.leo-span]
path = "./compiler/span"
version = "2.3.0"

[workspace.dependencies.leo-retriever]
path = "./utils/retriever"
version = "2.3.0"

[workspace.dependencies.aleo-std]
version = "0.1.24"
default-features = false

[workspace.dependencies.indexmap]
version = "2.6"
features = [ "serde" ]

[workspace.dependencies.itertools]
version = "0.13.0"

[workspace.dependencies.rand]
version = "0.8"
default-features = false

[workspace.dependencies.regex]
version = "1.11.0"

[workspace.dependencies.snarkvm]
version = "1.0.0"

[workspace.dependencies.serde]
version = "1.0.210"
features = [ "derive", "rc" ]

[workspace.dependencies.serde_json]
version = "1.0"
features = [ "preserve_order" ]

[workspace.dependencies.tracing]
version = "0.1"

[lib]
path = "leo/lib.rs"

Expand All @@ -65,36 +130,28 @@ text-tables = "0.3.1"
ureq = "2.10.1"

[dependencies.leo-ast]
path = "./compiler/ast"
version = "2.3.0"
workspace = true

[dependencies.leo-compiler]
path = "./compiler/compiler"
version = "2.3.0"
workspace = true

[dependencies.leo-errors]
path = "./errors"
version = "2.3.0"
workspace = true

[dependencies.leo-package]
path = "./leo/package"
version = "2.3.0"
workspace = true

[dependencies.leo-parser]
path = "./compiler/parser"
version = "2.3.0"
workspace = true

[dependencies.leo-span]
path = "./compiler/span"
version = "2.3.0"
workspace = true

[dependencies.leo-retriever]
path = "./utils/retriever"
version = "2.3.0"
workspace = true

[dependencies.aleo-std]
version = "0.1.24"
default-features = false
workspace = true

[dependencies.backtrace]
version = "0.3.74"
Expand All @@ -109,46 +166,28 @@ version = "0.6.1"
[dependencies.colored]
version = "2.0"

[dependencies.console]
version = "0.15.8"

[dependencies.dirs]
version = "5.0.0"

[dependencies.dotenvy]
version = "0.15.7"

[dependencies.indexmap]
version = "1.9"
features = [ "serde" ]

[dependencies.lazy_static]
version = "1.5.0"
workspace = true

[dependencies.rand]
version = "0.8"
workspace = true

[dependencies.rand_chacha]
version = "0.3.0"
default-features = false

[dependencies.rand_core]
version = "0.6.4"

[dependencies.reqwest]
version = "0.12.8"
features = [ "blocking", "json", "multipart" ]

[dependencies.self_update]
version = "0.41.0"
features = [ "archive-zip", "compression-zip-deflate" ]

[dependencies.serde]
version = "1.0"
features = [ "derive" ]
workspace = true

[dependencies.serde_json]
version = "1.0"
workspace = true

[dependencies.serial_test]
version = "3.1.1"
Expand Down Expand Up @@ -179,9 +218,6 @@ version = "7.3.1"
[target."cfg(windows)".dependencies.ansi_term]
version = "0.12.1"

[dev-dependencies.assert_cmd]
version = "2.0.16"

[dev-dependencies.rusty-hook]
d0cd marked this conversation as resolved.
Show resolved Hide resolved
version = "0.11.2"

Expand Down
21 changes: 6 additions & 15 deletions compiler/ast/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,22 @@ rust-version = "1.69"
workspace = true

[dependencies.leo-errors]
path = "../../errors"
version = "2.3.0"
workspace = true

[dependencies.leo-span]
path = "../span"
version = "2.3.0"
workspace = true

[dependencies.indexmap]
version = "1.9"
features = [ "serde-1" ]
workspace = true

[dependencies.itertools]
version = "0.13.0"
workspace = true

[dependencies.serde]
version = "1.0"
features = [ "derive", "rc" ]
workspace = true

[dependencies.serde_json]
version = "1.0"
features = [ "preserve_order" ]

[dependencies.smallvec]
version = "1.13.1"
features = [ "serde" ]
workspace = true

[dev-dependencies.criterion]
version = "0.5"
Expand Down
30 changes: 8 additions & 22 deletions compiler/compiler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,19 @@ edition = "2021"
rust-version = "1.69"

[dependencies.leo-ast]
path = "../ast"
version = "2.3.0"
workspace = true

[dependencies.leo-errors]
path = "../../errors"
version = "2.3.0"
workspace = true

[dependencies.leo-passes]
path = "../passes"
version = "2.3.0"
workspace = true

[dependencies.leo-parser]
path = "../parser"
version = "2.3.0"
workspace = true

[dependencies.leo-span]
path = "../span"
version = "2.3.0"
workspace = true

[dependencies.sha2]
version = "0.10"
Expand All @@ -45,8 +40,7 @@ version = "0.10"
workspace = true

[dependencies.indexmap]
version = "1.9"
features = [ ]
workspace = true

[dev-dependencies.leo-disassembler]
path = "../../utils/disassembler"
Expand All @@ -64,22 +58,14 @@ path = "../../tests/test-framework"
version = "0.1.7"
default-features = false

[dev-dependencies.dotenvy]
version = "0.15.7"

[dev-dependencies.rand]
version = "0.8"
default-features = false

[dev-dependencies.snarkvm]
workspace = true

[dev-dependencies.regex]
version = "1.11.0"
workspace = true

[dev-dependencies.serde]
version = "1.0.210"
features = [ "derive" ]
workspace = true

[dev-dependencies.serde_yaml]
version = "0.8.25"
Expand Down
25 changes: 7 additions & 18 deletions compiler/parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,13 @@ edition = "2021"
rust-version = "1.69"

[dependencies.leo-ast]
path = "../ast"
version = "2.3.0"
workspace = true

[dependencies.leo-errors]
path = "../../errors"
version = "2.3.0"
workspace = true

[dependencies.leo-span]
path = "../span"
version = "2.3.0"
workspace = true

[dependencies.snarkvm]
workspace = true
Expand All @@ -38,27 +35,19 @@ version = "4.5"
features = [ "derive" ]

[dependencies.indexmap]
version = "1.9"

[dependencies.lazy_static]
version = "1.5.0"
workspace = true

[dependencies.serde]
version = "1.0"
features = [ "derive" ]

[dependencies.smallvec]
version = "1.13"
workspace = true

[dependencies.tracing]
version = "0.1"
workspace = true

[dev-dependencies.leo-test-framework]
path = "../../tests/test-framework"

[dev-dependencies.serde_json]
version = "1.0"
features = [ "preserve_order" ]
workspace = true

[dev-dependencies.serde_yaml]
version = "0.8"
Expand Down
22 changes: 8 additions & 14 deletions compiler/passes/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,34 +25,28 @@ path = "src/lib.rs"
workspace = true

[dependencies.leo-ast]
path = "../ast"
version = "2.3.0"
workspace = true

[dependencies.leo-errors]
path = "../../errors"
version = "2.3.0"
workspace = true

[dependencies.leo-parser]
path = "../parser"
version = "2.3.0"
workspace = true

[dependencies.leo-span]
path = "../span"
version = "2.3.0"
workspace = true

[dependencies.indexmap]
version = "1.9"
workspace = true

[dependencies.itertools]
version = "0.13.0"
workspace = true

[dependencies.num-traits]
version = "0.2.19"

[dependencies.serde]
version = "1.0"
features = [ "derive", "rc" ]
workspace = true

[dependencies.serde_json]
version = "1.0"
features = [ "preserve_order" ]
workspace = true
2 changes: 1 addition & 1 deletion compiler/passes/src/common/symbol_table/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ impl SymbolTable {

/// Removes a variable from the symbol table.
pub fn remove_variable_from_current_scope(&mut self, location: Location) {
self.variables.remove(&location);
self.variables.shift_remove(&location);
}

/// Creates a new scope for the block and stores it in the symbol table.
Expand Down
2 changes: 1 addition & 1 deletion compiler/passes/src/common/tree_node/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ impl<N: Node> TreeNode<N> {

/// Removes an element from the current node.
pub fn remove_element(&mut self, element: &N) {
if !self.elements.remove(element) {
if !self.elements.shift_remove(element) {
self.counter += 1;
}
}
Expand Down
Loading
Loading