mirror of
https://github.com/ProvableHQ/leo.git
synced 2024-11-22 05:00:59 +03:00
Update rustfmt.toml to latest nightly and apply changes
This commit is contained in:
parent
d746c427cc
commit
174dae47db
@ -13,4 +13,4 @@ imports_layout = "HorizontalVertical"
|
|||||||
imports_granularity = "Crate"
|
imports_granularity = "Crate"
|
||||||
overflow_delimited_expr = true
|
overflow_delimited_expr = true
|
||||||
reorder_impl_items = true
|
reorder_impl_items = true
|
||||||
version = "Two"
|
style_edition = "2024"
|
||||||
|
@ -18,16 +18,16 @@ use leo_errors::Result;
|
|||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
use snarkvm::console::program::Identifier as IdentifierCore;
|
use snarkvm::console::program::Identifier as IdentifierCore;
|
||||||
|
|
||||||
use crate::{simple_node_impl, Node, NodeID};
|
use crate::{Node, NodeID, simple_node_impl};
|
||||||
use serde::{
|
use serde::{
|
||||||
de::{
|
|
||||||
Visitor,
|
|
||||||
{self},
|
|
||||||
},
|
|
||||||
Deserialize,
|
Deserialize,
|
||||||
Deserializer,
|
Deserializer,
|
||||||
Serialize,
|
Serialize,
|
||||||
Serializer,
|
Serializer,
|
||||||
|
de::{
|
||||||
|
Visitor,
|
||||||
|
{self},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
use std::{
|
use std::{
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use crate::Program;
|
use crate::Program;
|
||||||
|
|
||||||
use leo_span::{symbol::with_session_globals, Symbol};
|
use leo_span::{Symbol, symbol::with_session_globals};
|
||||||
|
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
use serde::{Deserialize, Deserializer, Serialize, Serializer};
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{access::*, Node, NodeID};
|
use crate::{Node, NodeID, access::*};
|
||||||
use leo_span::Span;
|
use leo_span::Span;
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
/// A binary operator.
|
/// A binary operator.
|
||||||
///
|
///
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
use crate::{simple_node_impl, Node, NodeID, ProgramId};
|
use crate::{Node, NodeID, ProgramId, simple_node_impl};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{fmt, hash::Hash};
|
use std::{fmt, hash::Hash};
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
/// A unary operator for a unary expression.
|
/// A unary operator for a unary expression.
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{simple_node_impl, Identifier, Node, NodeID};
|
use crate::{Identifier, Node, NodeID, simple_node_impl};
|
||||||
|
|
||||||
use leo_span::Span;
|
use leo_span::Span;
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
/// A core instruction that maps directly to an AVM bytecode instruction.
|
/// A core instruction that maps directly to an AVM bytecode instruction.
|
||||||
#[derive(Clone, PartialEq, Eq)]
|
#[derive(Clone, PartialEq, Eq)]
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{groups::GroupCoordinate, NodeID};
|
use crate::{NodeID, groups::GroupCoordinate};
|
||||||
|
|
||||||
use leo_span::Span;
|
use leo_span::Span;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ use crate::Identifier;
|
|||||||
|
|
||||||
use core::fmt;
|
use core::fmt;
|
||||||
use leo_span::Symbol;
|
use leo_span::Symbol;
|
||||||
use serde::{de, de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
|
use serde::{Deserialize, Deserializer, Serialize, Serializer, de, de::Visitor};
|
||||||
use snarkvm::{console::program::ProgramID, prelude::Network};
|
use snarkvm::{console::program::ProgramID, prelude::Network};
|
||||||
use std::collections::BTreeMap;
|
use std::collections::BTreeMap;
|
||||||
|
|
||||||
|
@ -31,7 +31,7 @@ use crate::{
|
|||||||
Type,
|
Type,
|
||||||
Variant,
|
Variant,
|
||||||
};
|
};
|
||||||
use leo_span::{sym, Span, Symbol};
|
use leo_span::{Span, Symbol, sym};
|
||||||
|
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::Type;
|
use crate::Type;
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
/// A core constant that maps directly to an AVM bytecode constant.
|
/// A core constant that maps directly to an AVM bytecode constant.
|
||||||
#[derive(Clone, PartialEq, Eq)]
|
#[derive(Clone, PartialEq, Eq)]
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{common, ArrayType, CompositeType, FutureType, Identifier, IntegerType, MappingType, TupleType};
|
use crate::{ArrayType, CompositeType, FutureType, Identifier, IntegerType, MappingType, TupleType, common};
|
||||||
|
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
use leo_span::Symbol;
|
use leo_span::Symbol;
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use crate::{GroupLiteral, Identifier, IntegerType, Literal, NodeID, Type};
|
use crate::{GroupLiteral, Identifier, IntegerType, Literal, NodeID, Type};
|
||||||
|
|
||||||
use leo_errors::{type_name, FlattenError, LeoError, Result};
|
use leo_errors::{FlattenError, LeoError, Result, type_name};
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
|
@ -22,10 +22,10 @@ use crate::CompilerOptions;
|
|||||||
|
|
||||||
pub use leo_ast::Ast;
|
pub use leo_ast::Ast;
|
||||||
use leo_ast::{NodeBuilder, Program, Stub};
|
use leo_ast::{NodeBuilder, Program, Stub};
|
||||||
use leo_errors::{emitter::Handler, CompilerError, Result};
|
use leo_errors::{CompilerError, Result, emitter::Handler};
|
||||||
pub use leo_passes::SymbolTable;
|
pub use leo_passes::SymbolTable;
|
||||||
use leo_passes::*;
|
use leo_passes::*;
|
||||||
use leo_span::{source_map::FileName, symbol::with_session_globals, Symbol};
|
use leo_span::{Symbol, source_map::FileName, symbol::with_session_globals};
|
||||||
|
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
|
|
||||||
|
@ -16,6 +16,9 @@
|
|||||||
|
|
||||||
mod utilities;
|
mod utilities;
|
||||||
use utilities::{
|
use utilities::{
|
||||||
|
BufferEmitter,
|
||||||
|
CompileOutput,
|
||||||
|
CurrentNetwork,
|
||||||
compile_and_process,
|
compile_and_process,
|
||||||
get_build_options,
|
get_build_options,
|
||||||
get_cwd_option,
|
get_cwd_option,
|
||||||
@ -23,19 +26,16 @@ use utilities::{
|
|||||||
hash_content,
|
hash_content,
|
||||||
hash_symbol_tables,
|
hash_symbol_tables,
|
||||||
parse_program,
|
parse_program,
|
||||||
BufferEmitter,
|
|
||||||
CompileOutput,
|
|
||||||
CurrentNetwork,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use leo_compiler::{CompilerOptions, OutputOptions};
|
use leo_compiler::{CompilerOptions, OutputOptions};
|
||||||
use leo_disassembler::disassemble_from_str;
|
use leo_disassembler::disassemble_from_str;
|
||||||
use leo_errors::{emitter::Handler, LeoError};
|
use leo_errors::{LeoError, emitter::Handler};
|
||||||
use leo_span::symbol::create_session_if_not_set_then;
|
use leo_span::symbol::create_session_if_not_set_then;
|
||||||
use leo_test_framework::{
|
use leo_test_framework::{
|
||||||
runner::{Namespace, ParseType, Runner},
|
|
||||||
Test,
|
|
||||||
PROGRAM_DELIMITER,
|
PROGRAM_DELIMITER,
|
||||||
|
Test,
|
||||||
|
runner::{Namespace, ParseType, Runner},
|
||||||
};
|
};
|
||||||
|
|
||||||
use snarkvm::console::prelude::*;
|
use snarkvm::console::prelude::*;
|
||||||
|
@ -16,6 +16,10 @@
|
|||||||
|
|
||||||
mod utilities;
|
mod utilities;
|
||||||
use utilities::{
|
use utilities::{
|
||||||
|
BufferEmitter,
|
||||||
|
CompileOutput,
|
||||||
|
CurrentNetwork,
|
||||||
|
ExecuteOutput,
|
||||||
buffer_if_err,
|
buffer_if_err,
|
||||||
compile_and_process,
|
compile_and_process,
|
||||||
get_build_options,
|
get_build_options,
|
||||||
@ -24,20 +28,16 @@ use utilities::{
|
|||||||
hash_content,
|
hash_content,
|
||||||
hash_symbol_tables,
|
hash_symbol_tables,
|
||||||
parse_program,
|
parse_program,
|
||||||
BufferEmitter,
|
|
||||||
CompileOutput,
|
|
||||||
CurrentNetwork,
|
|
||||||
ExecuteOutput,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use leo_compiler::{CompilerOptions, OutputOptions};
|
use leo_compiler::{CompilerOptions, OutputOptions};
|
||||||
use leo_errors::emitter::Handler;
|
use leo_errors::emitter::Handler;
|
||||||
use leo_span::symbol::create_session_if_not_set_then;
|
use leo_span::symbol::create_session_if_not_set_then;
|
||||||
use leo_test_framework::{
|
use leo_test_framework::{
|
||||||
|
PROGRAM_DELIMITER,
|
||||||
|
Test,
|
||||||
runner::{Namespace, ParseType, Runner},
|
runner::{Namespace, ParseType, Runner},
|
||||||
test::TestExpectationMode,
|
test::TestExpectationMode,
|
||||||
Test,
|
|
||||||
PROGRAM_DELIMITER,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
use aleo_std_storage::StorageMode;
|
use aleo_std_storage::StorageMode;
|
||||||
@ -51,7 +51,7 @@ use regex::Regex;
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_yaml::Value;
|
use serde_yaml::Value;
|
||||||
use snarkvm::{
|
use snarkvm::{
|
||||||
prelude::store::{helpers::memory::ConsensusMemory, ConsensusStore},
|
prelude::store::{ConsensusStore, helpers::memory::ConsensusMemory},
|
||||||
synthesizer::program::ProgramCore,
|
synthesizer::program::ProgramCore,
|
||||||
};
|
};
|
||||||
use std::{fs, panic::AssertUnwindSafe, path::Path, rc::Rc};
|
use std::{fs, panic::AssertUnwindSafe, path::Path, rc::Rc};
|
||||||
|
@ -22,13 +22,13 @@ pub use output::*;
|
|||||||
|
|
||||||
use leo_compiler::{BuildOptions, Compiler, CompilerOptions};
|
use leo_compiler::{BuildOptions, Compiler, CompilerOptions};
|
||||||
use leo_errors::{
|
use leo_errors::{
|
||||||
emitter::{Buffer, Emitter, Handler},
|
|
||||||
LeoError,
|
LeoError,
|
||||||
LeoWarning,
|
LeoWarning,
|
||||||
|
emitter::{Buffer, Emitter, Handler},
|
||||||
};
|
};
|
||||||
use leo_package::root::env::Env;
|
use leo_package::root::env::Env;
|
||||||
use leo_span::source_map::FileName;
|
use leo_span::source_map::FileName;
|
||||||
use leo_test_framework::{test::TestConfig, Test};
|
use leo_test_framework::{Test, test::TestConfig};
|
||||||
|
|
||||||
use snarkvm::prelude::*;
|
use snarkvm::prelude::*;
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ pub mod parser;
|
|||||||
pub use parser::*;
|
pub use parser::*;
|
||||||
|
|
||||||
use leo_ast::{Ast, NodeBuilder};
|
use leo_ast::{Ast, NodeBuilder};
|
||||||
use leo_errors::{emitter::Handler, Result};
|
use leo_errors::{Result, emitter::Handler};
|
||||||
|
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
|
|
||||||
|
@ -14,10 +14,10 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{tokenizer::*, Token};
|
use crate::{Token, tokenizer::*};
|
||||||
|
|
||||||
use leo_ast::*;
|
use leo_ast::*;
|
||||||
use leo_errors::{emitter::Handler, ParserError, ParserWarning, Result};
|
use leo_errors::{ParserError, ParserWarning, Result, emitter::Handler};
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
|
@ -398,4 +398,4 @@ impl<N: Network> ParserContext<'_, N> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
@ -19,11 +19,11 @@
|
|||||||
//! This module contains the [`parse()`] function which calls the underlying [`tokenize()`]
|
//! This module contains the [`parse()`] function which calls the underlying [`tokenize()`]
|
||||||
//! method to create a new program AST.
|
//! method to create a new program AST.
|
||||||
|
|
||||||
use crate::{tokenizer::*, Token};
|
use crate::{Token, tokenizer::*};
|
||||||
|
|
||||||
use leo_ast::*;
|
use leo_ast::*;
|
||||||
use leo_errors::{emitter::Handler, Result};
|
use leo_errors::{Result, emitter::Handler};
|
||||||
use leo_span::{span::BytePos, Span};
|
use leo_span::{Span, span::BytePos};
|
||||||
|
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
|
|
||||||
|
@ -14,18 +14,18 @@
|
|||||||
// You should have received a copy of the GNU General Public License
|
// 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/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{tokenizer, ParserContext, SpannedToken};
|
use crate::{ParserContext, SpannedToken, tokenizer};
|
||||||
|
|
||||||
use leo_ast::{NodeBuilder, NodeID, Statement};
|
use leo_ast::{NodeBuilder, NodeID, Statement};
|
||||||
use leo_errors::{emitter::Handler, LeoError};
|
use leo_errors::{LeoError, emitter::Handler};
|
||||||
use leo_span::{
|
use leo_span::{
|
||||||
source_map::FileName,
|
|
||||||
symbol::{create_session_if_not_set_then, SessionGlobals},
|
|
||||||
Span,
|
Span,
|
||||||
|
source_map::FileName,
|
||||||
|
symbol::{SessionGlobals, create_session_if_not_set_then},
|
||||||
};
|
};
|
||||||
use leo_test_framework::{
|
use leo_test_framework::{
|
||||||
runner::{Namespace, ParseType, Runner},
|
|
||||||
Test,
|
Test,
|
||||||
|
runner::{Namespace, ParseType, Runner},
|
||||||
};
|
};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use serde_yaml::Value;
|
use serde_yaml::Value;
|
||||||
|
@ -21,7 +21,7 @@ use leo_span::{Span, Symbol};
|
|||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{
|
use std::{
|
||||||
fmt,
|
fmt,
|
||||||
iter::{from_fn, Peekable},
|
iter::{Peekable, from_fn},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// Eat an identifier, that is, a string matching '[a-zA-Z][a-zA-Z\d_]*', if any.
|
/// Eat an identifier, that is, a string matching '[a-zA-Z][a-zA-Z\d_]*', if any.
|
||||||
|
@ -18,7 +18,7 @@ use std::fmt;
|
|||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
/// Represents all valid Leo syntax tokens.
|
/// Represents all valid Leo syntax tokens.
|
||||||
///
|
///
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
use crate::CodeGenerator;
|
use crate::CodeGenerator;
|
||||||
|
|
||||||
use leo_ast::{Composite, Function, Location, Mapping, Member, Mode, Program, ProgramScope, Type, Variant};
|
use leo_ast::{Composite, Function, Location, Mapping, Member, Mode, Program, ProgramScope, Type, Variant};
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
use itertools::Itertools;
|
use itertools::Itertools;
|
||||||
|
@ -23,7 +23,7 @@ pub use variable_symbol::*;
|
|||||||
|
|
||||||
use std::cell::RefCell;
|
use std::cell::RefCell;
|
||||||
|
|
||||||
use leo_ast::{normalize_json_value, remove_key_from_json, Composite, Function, Location};
|
use leo_ast::{Composite, Function, Location, normalize_json_value, remove_key_from_json};
|
||||||
use leo_errors::{AstError, Result};
|
use leo_errors::{AstError, Result};
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
@ -273,7 +273,7 @@ impl SymbolTable {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use leo_ast::{Identifier, Type, Variant};
|
use leo_ast::{Identifier, Type, Variant};
|
||||||
use leo_span::{symbol::create_session_if_not_set_then, Symbol};
|
use leo_span::{Symbol, symbol::create_session_if_not_set_then};
|
||||||
#[test]
|
#[test]
|
||||||
fn serialization_test() {
|
fn serialization_test() {
|
||||||
create_session_if_not_set_then(|_| {
|
create_session_if_not_set_then(|_| {
|
||||||
|
@ -29,7 +29,7 @@ pub mod unroll_statement;
|
|||||||
use crate::{Pass, SymbolTable, TypeTable};
|
use crate::{Pass, SymbolTable, TypeTable};
|
||||||
|
|
||||||
use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
|
use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
|
||||||
use leo_errors::{emitter::Handler, Result};
|
use leo_errors::{Result, emitter::Handler};
|
||||||
|
|
||||||
impl<'a> Pass for Unroller<'a> {
|
impl<'a> Pass for Unroller<'a> {
|
||||||
type Input = (Ast, &'a Handler, &'a NodeBuilder, SymbolTable, &'a TypeTable);
|
type Input = (Ast, &'a Handler, &'a NodeBuilder, SymbolTable, &'a TypeTable);
|
||||||
|
@ -19,7 +19,7 @@ use leo_ast::{Expression::Literal, Type::Integer, *};
|
|||||||
use leo_errors::loop_unroller::LoopUnrollerError;
|
use leo_errors::loop_unroller::LoopUnrollerError;
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
use crate::{unroller::Unroller, VariableSymbol, VariableType};
|
use crate::{VariableSymbol, VariableType, unroller::Unroller};
|
||||||
|
|
||||||
impl StatementReconstructor for Unroller<'_> {
|
impl StatementReconstructor for Unroller<'_> {
|
||||||
fn reconstruct_block(&mut self, input: Block) -> (Block, Self::AdditionalOutput) {
|
fn reconstruct_block(&mut self, input: Block) -> (Block, Self::AdditionalOutput) {
|
||||||
|
@ -32,12 +32,12 @@ use leo_errors::{emitter::Handler, loop_unroller::LoopUnrollerError};
|
|||||||
use leo_span::Symbol;
|
use leo_span::Symbol;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
constant_propagation_table::ConstantPropagationTable,
|
|
||||||
Clusivity,
|
Clusivity,
|
||||||
LoopBound,
|
LoopBound,
|
||||||
RangeIterator,
|
RangeIterator,
|
||||||
SymbolTable,
|
SymbolTable,
|
||||||
TypeTable,
|
TypeTable,
|
||||||
|
constant_propagation_table::ConstantPropagationTable,
|
||||||
};
|
};
|
||||||
|
|
||||||
pub struct Unroller<'a> {
|
pub struct Unroller<'a> {
|
||||||
|
@ -41,7 +41,7 @@ use leo_ast::{
|
|||||||
UnaryExpression,
|
UnaryExpression,
|
||||||
UnitExpression,
|
UnitExpression,
|
||||||
};
|
};
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
|
|
||||||
|
@ -29,7 +29,7 @@ use leo_ast::{
|
|||||||
StatementConsumer,
|
StatementConsumer,
|
||||||
StructConsumer,
|
StructConsumer,
|
||||||
};
|
};
|
||||||
use leo_span::{sym, Symbol};
|
use leo_span::{Symbol, sym};
|
||||||
|
|
||||||
use indexmap::IndexMap;
|
use indexmap::IndexMap;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use indexmap::IndexSet;
|
use indexmap::IndexSet;
|
||||||
use leo_ast::*;
|
use leo_ast::*;
|
||||||
use leo_errors::{emitter::Handler, AstError, LeoError};
|
use leo_errors::{AstError, LeoError, emitter::Handler};
|
||||||
use leo_span::Symbol;
|
use leo_span::Symbol;
|
||||||
|
|
||||||
use crate::{SymbolTable, VariableSymbol, VariableType};
|
use crate::{SymbolTable, VariableSymbol, VariableType};
|
||||||
|
@ -20,7 +20,7 @@ pub use creator::*;
|
|||||||
use crate::{Pass, SymbolTable};
|
use crate::{Pass, SymbolTable};
|
||||||
|
|
||||||
use leo_ast::{Ast, ProgramVisitor};
|
use leo_ast::{Ast, ProgramVisitor};
|
||||||
use leo_errors::{emitter::Handler, Result};
|
use leo_errors::{Result, emitter::Handler};
|
||||||
|
|
||||||
impl<'a> Pass for SymbolTableCreator<'a> {
|
impl<'a> Pass for SymbolTableCreator<'a> {
|
||||||
type Input = (&'a Ast, &'a Handler);
|
type Input = (&'a Ast, &'a Handler);
|
||||||
|
@ -17,8 +17,8 @@
|
|||||||
use crate::{TypeChecker, VariableSymbol};
|
use crate::{TypeChecker, VariableSymbol};
|
||||||
|
|
||||||
use leo_ast::*;
|
use leo_ast::*;
|
||||||
use leo_errors::{emitter::Handler, TypeCheckerError};
|
use leo_errors::{TypeCheckerError, emitter::Handler};
|
||||||
use leo_span::{sym, Span, Symbol};
|
use leo_span::{Span, Symbol, sym};
|
||||||
|
|
||||||
use snarkvm::console::network::Network;
|
use snarkvm::console::network::Network;
|
||||||
|
|
||||||
|
@ -15,17 +15,17 @@
|
|||||||
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
type_checking::{await_checker::AwaitChecker, scope_state::ScopeState},
|
|
||||||
CallGraph,
|
CallGraph,
|
||||||
StructGraph,
|
StructGraph,
|
||||||
SymbolTable,
|
SymbolTable,
|
||||||
TypeTable,
|
TypeTable,
|
||||||
VariableSymbol,
|
VariableSymbol,
|
||||||
VariableType,
|
VariableType,
|
||||||
|
type_checking::{await_checker::AwaitChecker, scope_state::ScopeState},
|
||||||
};
|
};
|
||||||
|
|
||||||
use leo_ast::*;
|
use leo_ast::*;
|
||||||
use leo_errors::{emitter::Handler, TypeCheckerError, TypeCheckerWarning};
|
use leo_errors::{TypeCheckerError, TypeCheckerWarning, emitter::Handler};
|
||||||
use leo_span::{Span, Symbol};
|
use leo_span::{Span, Symbol};
|
||||||
|
|
||||||
use snarkvm::console::network::Network;
|
use snarkvm::console::network::Network;
|
||||||
|
@ -31,7 +31,7 @@ pub use checker::*;
|
|||||||
use crate::{CallGraph, Pass, StructGraph, SymbolTable, TypeTable};
|
use crate::{CallGraph, Pass, StructGraph, SymbolTable, TypeTable};
|
||||||
|
|
||||||
use leo_ast::{Ast, ProgramVisitor};
|
use leo_ast::{Ast, ProgramVisitor};
|
||||||
use leo_errors::{emitter::Handler, Result};
|
use leo_errors::{Result, emitter::Handler};
|
||||||
|
|
||||||
use snarkvm::prelude::Network;
|
use snarkvm::prelude::Network;
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@
|
|||||||
#![recursion_limit = "256"]
|
#![recursion_limit = "256"]
|
||||||
|
|
||||||
pub mod symbol;
|
pub mod symbol;
|
||||||
pub use symbol::{sym, Symbol};
|
pub use symbol::{Symbol, sym};
|
||||||
|
|
||||||
pub mod span;
|
pub mod span;
|
||||||
pub use span::Span;
|
pub use span::Span;
|
||||||
|
@ -19,10 +19,10 @@
|
|||||||
use crate::Span;
|
use crate::Span;
|
||||||
|
|
||||||
use serde::{
|
use serde::{
|
||||||
de::{MapAccess, Visitor},
|
|
||||||
ser::SerializeMap,
|
|
||||||
Deserializer,
|
Deserializer,
|
||||||
Serializer,
|
Serializer,
|
||||||
|
de::{MapAccess, Visitor},
|
||||||
|
ser::SerializeMap,
|
||||||
};
|
};
|
||||||
use std::fmt;
|
use std::fmt;
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
#![forbid(unsafe_code)]
|
#![forbid(unsafe_code)]
|
||||||
|
|
||||||
use abnf::types::{Node, Rule};
|
use abnf::types::{Node, Rule};
|
||||||
use anyhow::{anyhow, Result};
|
use anyhow::{Result, anyhow};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
|
|
||||||
/// Processor's scope. Used when code block or definition starts or ends.
|
/// Processor's scope. Used when code block or definition starts or ends.
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use crate::{Backtraced, INDENT};
|
use crate::{Backtraced, INDENT};
|
||||||
|
|
||||||
use leo_span::{source_map::SpanLocation, symbol::with_session_globals, Span};
|
use leo_span::{Span, source_map::SpanLocation, symbol::with_session_globals};
|
||||||
|
|
||||||
use backtrace::Backtrace;
|
use backtrace::Backtrace;
|
||||||
use color_backtrace::{BacktracePrinter, Verbosity};
|
use color_backtrace::{BacktracePrinter, Verbosity};
|
||||||
|
@ -259,7 +259,7 @@ impl Handler {
|
|||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::ParserError;
|
use crate::ParserError;
|
||||||
use leo_span::{symbol::create_session_if_not_set_then, Span};
|
use leo_span::{Span, symbol::create_session_if_not_set_then};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn fresh_no_errors() {
|
fn fresh_no_errors() {
|
||||||
|
@ -146,9 +146,9 @@ pub fn run_with_args(cli: CLI) -> Result<()> {
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::cli::{
|
use crate::cli::{
|
||||||
cli::{test_helpers, Commands},
|
|
||||||
run_with_args,
|
|
||||||
CLI,
|
CLI,
|
||||||
|
cli::{Commands, test_helpers},
|
||||||
|
run_with_args,
|
||||||
};
|
};
|
||||||
use leo_span::symbol::create_session_if_not_set_then;
|
use leo_span::symbol::create_session_if_not_set_then;
|
||||||
use serial_test::serial;
|
use serial_test::serial;
|
||||||
@ -310,7 +310,7 @@ mod tests {
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test_helpers {
|
mod test_helpers {
|
||||||
use crate::cli::{cli::Commands, run_with_args, Add, New, CLI};
|
use crate::cli::{Add, CLI, New, cli::Commands, run_with_args};
|
||||||
use leo_span::symbol::create_session_if_not_set_then;
|
use leo_span::symbol::create_session_if_not_set_then;
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use aleo_std::StorageMode;
|
use aleo_std::StorageMode;
|
||||||
use dialoguer::{theme::ColorfulTheme, Confirm};
|
use dialoguer::{Confirm, theme::ColorfulTheme};
|
||||||
use leo_retriever::NetworkName;
|
use leo_retriever::NetworkName;
|
||||||
use num_format::{Locale, ToFormattedString};
|
use num_format::{Locale, ToFormattedString};
|
||||||
use snarkvm::{
|
use snarkvm::{
|
||||||
@ -24,13 +24,13 @@ use snarkvm::{
|
|||||||
ledger::query::Query as SnarkVMQuery,
|
ledger::query::Query as SnarkVMQuery,
|
||||||
package::Package as SnarkVMPackage,
|
package::Package as SnarkVMPackage,
|
||||||
prelude::{
|
prelude::{
|
||||||
deployment_cost,
|
|
||||||
store::{helpers::memory::ConsensusMemory, ConsensusStore},
|
|
||||||
CanaryV0,
|
CanaryV0,
|
||||||
MainnetV0,
|
MainnetV0,
|
||||||
ProgramOwner,
|
ProgramOwner,
|
||||||
TestnetV0,
|
TestnetV0,
|
||||||
VM,
|
VM,
|
||||||
|
deployment_cost,
|
||||||
|
store::{ConsensusStore, helpers::memory::ConsensusMemory},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
|
@ -24,7 +24,7 @@ use snarkvm::{
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use crate::cli::query::QueryCommands;
|
use crate::cli::query::QueryCommands;
|
||||||
use dialoguer::{theme::ColorfulTheme, Confirm};
|
use dialoguer::{Confirm, theme::ColorfulTheme};
|
||||||
use leo_retriever::NetworkName;
|
use leo_retriever::NetworkName;
|
||||||
use snarkvm::{
|
use snarkvm::{
|
||||||
circuit::{Aleo, AleoCanaryV0, AleoTestnetV0, AleoV0},
|
circuit::{Aleo, AleoCanaryV0, AleoTestnetV0, AleoV0},
|
||||||
@ -32,19 +32,19 @@ use snarkvm::{
|
|||||||
ledger::Transaction::Execute as ExecuteTransaction,
|
ledger::Transaction::Execute as ExecuteTransaction,
|
||||||
package::Package as SnarkVMPackage,
|
package::Package as SnarkVMPackage,
|
||||||
prelude::{
|
prelude::{
|
||||||
execution_cost,
|
|
||||||
query::Query as SnarkVMQuery,
|
|
||||||
store::{
|
|
||||||
helpers::memory::{BlockMemory, ConsensusMemory},
|
|
||||||
ConsensusStore,
|
|
||||||
},
|
|
||||||
Identifier,
|
Identifier,
|
||||||
Locator,
|
Locator,
|
||||||
Process,
|
Process,
|
||||||
Program as SnarkVMProgram,
|
Program as SnarkVMProgram,
|
||||||
ProgramID,
|
ProgramID,
|
||||||
Value,
|
|
||||||
VM,
|
VM,
|
||||||
|
Value,
|
||||||
|
execution_cost,
|
||||||
|
query::Query as SnarkVMQuery,
|
||||||
|
store::{
|
||||||
|
ConsensusStore,
|
||||||
|
helpers::memory::{BlockMemory, ConsensusMemory},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -55,9 +55,9 @@ pub use update::Update;
|
|||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
use crate::cli::helpers::context::*;
|
use crate::cli::helpers::context::*;
|
||||||
use leo_errors::{emitter::Handler, CliError, PackageError, Result};
|
use leo_errors::{CliError, PackageError, Result, emitter::Handler};
|
||||||
use leo_package::{build::*, outputs::OutputsDirectory, package::*};
|
use leo_package::{build::*, outputs::OutputsDirectory, package::*};
|
||||||
use snarkvm::prelude::{block::Transaction, Address, Ciphertext, Plaintext, PrivateKey, Record, ViewKey};
|
use snarkvm::prelude::{Address, Ciphertext, Plaintext, PrivateKey, Record, ViewKey, block::Transaction};
|
||||||
|
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use colored::Colorize;
|
use colored::Colorize;
|
||||||
|
@ -42,7 +42,7 @@ mod utils;
|
|||||||
use utils::*;
|
use utils::*;
|
||||||
|
|
||||||
use leo_errors::UtilError;
|
use leo_errors::UtilError;
|
||||||
use leo_retriever::{fetch_from_network, verify_valid_program, NetworkName};
|
use leo_retriever::{NetworkName, fetch_from_network, verify_valid_program};
|
||||||
|
|
||||||
/// Query live data from the Aleo network.
|
/// Query live data from the Aleo network.
|
||||||
#[derive(Parser, Debug)]
|
#[derive(Parser, Debug)]
|
||||||
|
@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
use aleo_std;
|
use aleo_std;
|
||||||
use leo_errors::{CliError, PackageError, Result};
|
use leo_errors::{CliError, PackageError, Result};
|
||||||
use leo_package::build::{BuildDirectory, BUILD_DIRECTORY_NAME};
|
use leo_package::build::{BUILD_DIRECTORY_NAME, BuildDirectory};
|
||||||
use leo_retriever::LockFileEntry;
|
use leo_retriever::LockFileEntry;
|
||||||
|
|
||||||
use snarkvm::file::Manifest;
|
use snarkvm::file::Manifest;
|
||||||
|
@ -20,9 +20,9 @@ use colored::Colorize;
|
|||||||
use std::{fmt, sync::Once};
|
use std::{fmt, sync::Once};
|
||||||
use tracing::{event::Event, subscriber::Subscriber};
|
use tracing::{event::Event, subscriber::Subscriber};
|
||||||
use tracing_subscriber::{
|
use tracing_subscriber::{
|
||||||
fmt::{format::*, time::*, FmtContext, FormattedFields},
|
|
||||||
registry::LookupSpan,
|
|
||||||
FmtSubscriber,
|
FmtSubscriber,
|
||||||
|
fmt::{FmtContext, FormattedFields, format::*, time::*},
|
||||||
|
registry::LookupSpan,
|
||||||
};
|
};
|
||||||
|
|
||||||
static START: Once = Once::new();
|
static START: Once = Once::new();
|
||||||
|
@ -19,7 +19,7 @@ use leo_errors::{CliError, Result};
|
|||||||
use std::fmt::Write as _;
|
use std::fmt::Write as _;
|
||||||
|
|
||||||
use colored::Colorize;
|
use colored::Colorize;
|
||||||
use self_update::{backends::github, version::bump_is_greater, Status};
|
use self_update::{Status, backends::github, version::bump_is_greater};
|
||||||
|
|
||||||
pub struct Updater;
|
pub struct Updater;
|
||||||
|
|
||||||
|
@ -22,7 +22,7 @@ use leo_errors::emitter::{Emitter, Handler};
|
|||||||
use leo_span::{source_map::FileName, symbol::SESSION_GLOBALS};
|
use leo_span::{source_map::FileName, symbol::SESSION_GLOBALS};
|
||||||
use leo_test_framework::get_benches;
|
use leo_test_framework::get_benches;
|
||||||
|
|
||||||
use criterion::{black_box, criterion_group, criterion_main, Criterion};
|
use criterion::{Criterion, black_box, criterion_group, criterion_main};
|
||||||
use std::{
|
use std::{
|
||||||
path::PathBuf,
|
path::PathBuf,
|
||||||
time::{Duration, Instant},
|
time::{Duration, Instant},
|
||||||
|
@ -23,7 +23,7 @@ pub use program_context::*;
|
|||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
use leo_span::{symbol::create_session_if_not_set_then, Symbol};
|
use leo_span::{Symbol, symbol::create_session_if_not_set_then};
|
||||||
|
|
||||||
use aleo_std::aleo_dir;
|
use aleo_std::aleo_dir;
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@ use crate::{Dependency, Location, LockFileEntry, Manifest, NetworkName, ProgramC
|
|||||||
use leo_ast::Stub;
|
use leo_ast::Stub;
|
||||||
use leo_disassembler::disassemble_from_str;
|
use leo_disassembler::disassemble_from_str;
|
||||||
use leo_errors::UtilError;
|
use leo_errors::UtilError;
|
||||||
use leo_passes::{common::DiGraph, DiGraphError};
|
use leo_passes::{DiGraphError, common::DiGraph};
|
||||||
use leo_span::Symbol;
|
use leo_span::Symbol;
|
||||||
|
|
||||||
use snarkvm::prelude::{Network, Program};
|
use snarkvm::prelude::{Network, Program};
|
||||||
|
Loading…
Reference in New Issue
Block a user