mirror of
https://github.com/ProvableHQ/leo.git
synced 2024-09-11 05:45:30 +03:00
Merge pull request #27810 from AleoHQ/rename/disasm-retriever-crates
[Refactor] Rename `disassembler` and `retriever` crates.
This commit is contained in:
commit
06c24bbef9
7
.github/workflows/ci.yml
vendored
7
.github/workflows/ci.yml
vendored
@ -100,6 +100,7 @@ jobs:
|
||||
RUSTC_WRAPPER: sccache
|
||||
SCCACHE_CACHE_SIZE: 2G
|
||||
SCCACHE_DIR: /Users/runner/Library/Caches/Mozilla.sccache
|
||||
# SCCACHE_RECACHE: 1 # Uncomment this to clear cache, then comment it back out
|
||||
steps:
|
||||
- name: Xcode Select
|
||||
uses: maxim-lobanov/setup-xcode@v1
|
||||
@ -148,8 +149,8 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
run: |
|
||||
SDKROOT=$(xcrun -sdk macosx11.1 --show-sdk-path) \
|
||||
MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx11.1 --show-sdk-platform-version) \
|
||||
SDKROOT=$(xcrun -sdk macosx --show-sdk-path) \
|
||||
MACOSX_DEPLOYMENT_TARGET=$(xcrun -sdk macosx --show-sdk-platform-version) \
|
||||
cargo test --all
|
||||
|
||||
- name: Print sccache stats
|
||||
@ -334,4 +335,4 @@ jobs:
|
||||
run: sccache --show-stats
|
||||
|
||||
- name: Stop sccache server
|
||||
run: sccache --stop-server || true
|
||||
run: sccache --stop-server || true
|
||||
|
420
Cargo.lock
generated
420
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
10
Cargo.toml
10
Cargo.toml
@ -58,10 +58,6 @@ default = [ ]
|
||||
ci_skip = [ "leo-compiler/ci_skip" ]
|
||||
noconfig = [ ]
|
||||
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
|
||||
[dependencies.leo-ast]
|
||||
path = "./compiler/ast"
|
||||
version = "=1.10.0"
|
||||
@ -86,10 +82,14 @@ version = "=1.10.0"
|
||||
path = "./compiler/span"
|
||||
version = "=1.10.0"
|
||||
|
||||
[dependencies.retriever]
|
||||
[dependencies.leo-retriever]
|
||||
path = "./utils/retriever"
|
||||
version = "1.10.0"
|
||||
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
|
||||
[dependencies.backtrace]
|
||||
version = "0.3.68"
|
||||
|
||||
|
@ -15,7 +15,7 @@
|
||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
use super::*;
|
||||
use retriever::{Dependency, Location, Manifest, Network};
|
||||
use leo_retriever::{Dependency, Location, Manifest, Network};
|
||||
use std::path::PathBuf;
|
||||
|
||||
/// Clean outputs folder command
|
||||
|
@ -20,8 +20,8 @@ use leo_ast::Stub;
|
||||
use leo_compiler::{Compiler, CompilerOptions, OutputOptions};
|
||||
use leo_errors::UtilError;
|
||||
use leo_package::{build::BuildDirectory, outputs::OutputsDirectory, source::SourceDirectory};
|
||||
use leo_retriever::Retriever;
|
||||
use leo_span::Symbol;
|
||||
use retriever::Retriever;
|
||||
|
||||
use snarkvm::{
|
||||
package::Package,
|
||||
|
@ -18,12 +18,12 @@ use super::*;
|
||||
use aleo_std;
|
||||
use leo_errors::{CliError, PackageError, Result};
|
||||
use leo_package::build::{BuildDirectory, BUILD_DIRECTORY_NAME};
|
||||
use leo_retriever::LockFileEntry;
|
||||
|
||||
use snarkvm::file::Manifest;
|
||||
|
||||
use aleo_std::aleo_dir;
|
||||
use indexmap::IndexMap;
|
||||
use retriever::LockFileEntry;
|
||||
use std::{
|
||||
env::current_dir,
|
||||
fs::File,
|
||||
|
@ -18,19 +18,20 @@ license = "GPL-3.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.69"
|
||||
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
[dependencies.leo-errors]
|
||||
path = "../../errors"
|
||||
version = "=1.10.0"
|
||||
|
||||
[dependencies.leo-retriever]
|
||||
path = "../../utils/retriever"
|
||||
version = "1.10.0"
|
||||
|
||||
[dependencies.snarkvm]
|
||||
workspace = true
|
||||
|
||||
#[dependencies.snarkos-cli]
|
||||
#version = "2.2.4"
|
||||
|
||||
[dependencies.leo-errors]
|
||||
path = "../../errors"
|
||||
version = "=1.10.0"
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
|
||||
[dependencies.indexmap]
|
||||
version = "1.9"
|
||||
@ -46,16 +47,15 @@ features = [ "derive" ]
|
||||
[dependencies.serial_test]
|
||||
version = "3.0.0"
|
||||
|
||||
#[dependencies.snarkos-cli]
|
||||
#version = "2.2.4"
|
||||
|
||||
[dependencies.toml]
|
||||
version = "0.8"
|
||||
|
||||
[dependencies.tracing]
|
||||
version = "0.1"
|
||||
|
||||
[dependencies.retriever]
|
||||
path = "../../utils/retriever"
|
||||
version = "1.10.0"
|
||||
|
||||
[dev-dependencies.lazy_static]
|
||||
version = "1.3.0"
|
||||
|
||||
|
@ -1,8 +1,8 @@
|
||||
[package]
|
||||
name = "disassembler"
|
||||
name = "leo-disassembler"
|
||||
version = "1.10.0"
|
||||
authors = [ "The Aleo Team <hello@aleo.org>" ]
|
||||
description = "Compiler passes for the Leo programming language"
|
||||
description = "A disassembler for the Leo programming language"
|
||||
homepage = "https://aleo.org"
|
||||
repository = "https://github.com/AleoHQ/leo"
|
||||
keywords = [
|
||||
@ -34,4 +34,4 @@ version = "1.10.0"
|
||||
|
||||
[dependencies.leo-errors]
|
||||
path = "../../errors"
|
||||
version = "1.10.0"
|
||||
version = "1.10.0"
|
||||
|
@ -1,9 +1,50 @@
|
||||
[package]
|
||||
name = "retriever"
|
||||
name = "leo-retriever"
|
||||
version = "1.10.0"
|
||||
authors = [ "The Aleo Team <hello@aleo.org>" ]
|
||||
description = "A retriever for the Leo programming language"
|
||||
homepage = "https://aleo.org"
|
||||
repository = "https://github.com/AleoHQ/leo"
|
||||
keywords = [
|
||||
"aleo",
|
||||
"cryptography",
|
||||
"leo",
|
||||
"programming-language",
|
||||
"zero-knowledge"
|
||||
]
|
||||
categories = [ "compilers", "cryptography", "web-programming" ]
|
||||
include = [ "Cargo.toml", "src", "README.md", "LICENSE.md" ]
|
||||
license = "GPL-3.0"
|
||||
edition = "2021"
|
||||
rust-version = "1.69"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
[dependencies.leo-ast]
|
||||
version = "1.10.0"
|
||||
path = "../../compiler/ast"
|
||||
|
||||
[dependencies.leo-disassembler]
|
||||
version = "1.10.0"
|
||||
path = "../disassembler"
|
||||
|
||||
[dependencies.leo-errors]
|
||||
path = "../../errors"
|
||||
version = "=1.10.0"
|
||||
|
||||
[dependencies.leo-passes]
|
||||
version = "1.10.0"
|
||||
path = "../../compiler/passes"
|
||||
|
||||
[dependencies.leo-span]
|
||||
version = "1.10.0"
|
||||
path = "../../compiler/span"
|
||||
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
|
||||
[dependencies.indexmap]
|
||||
version = "1.9"
|
||||
features = [ "serde-1" ]
|
||||
|
||||
[dependencies.serde]
|
||||
version = "1.0"
|
||||
@ -12,44 +53,17 @@ features = [ "derive"]
|
||||
[dependencies.serde_json]
|
||||
version = "1.0"
|
||||
|
||||
[dependencies.leo-errors]
|
||||
path = "../../errors"
|
||||
version = "=1.10.0"
|
||||
|
||||
[dependencies.indexmap]
|
||||
version = "1.9"
|
||||
features = [ "serde-1" ]
|
||||
|
||||
[dependencies.leo-ast]
|
||||
version = "1.9.4"
|
||||
path = "../../compiler/ast"
|
||||
|
||||
[dependencies.toml]
|
||||
version = "0.8.12"
|
||||
|
||||
[dependencies.aleo-std]
|
||||
version = "0.1.24"
|
||||
default-features = false
|
||||
|
||||
[dependencies.disassembler]
|
||||
version = "1.10.0"
|
||||
path = "../disassembler"
|
||||
[dependencies.serial_test]
|
||||
version = "3.0.0"
|
||||
|
||||
[dependencies.sha2]
|
||||
version = "0.10.8"
|
||||
|
||||
[dependencies.serial_test]
|
||||
version = "3.0.0"
|
||||
[dependencies.tempfile]
|
||||
version = "3.10.1"
|
||||
|
||||
[dependencies.leo-span]
|
||||
version = "1.9.4"
|
||||
path = "../../compiler/span"
|
||||
[dependencies.toml]
|
||||
version = "0.8.12"
|
||||
|
||||
[dependencies.ureq]
|
||||
version = "2.9"
|
||||
|
||||
[dependencies.leo-passes]
|
||||
version = "1.9.4"
|
||||
path = "../../compiler/passes"
|
||||
[dependencies]
|
||||
tempfile = "3.10.1"
|
@ -14,9 +14,9 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
use disassembler::disassemble_from_str;
|
||||
use indexmap::{IndexMap, IndexSet};
|
||||
use leo_ast::Stub;
|
||||
use leo_disassembler::disassemble_from_str;
|
||||
use leo_errors::UtilError;
|
||||
use leo_passes::{common::DiGraph, DiGraphError};
|
||||
use leo_span::Symbol;
|
||||
|
Loading…
Reference in New Issue
Block a user