ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-11-26 16:37:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

rebase fix

Browse Source
This commit is contained in:
evan-schott 2023-11-03 18:00:17 -07:00
parent bd2e3de733
commit f1a19b2a03
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compiler/ast/src/functions/mod.rs
View File

@ -38,8 +38,7 @@ pub use output::*;
pub mod mode; pub mod mode;
pub use mode::*; pub use mode::*;
use crate::{Block, FunctionStub, Identifier, Node, NodeID, Tuple, Type}; use crate::{Block, FunctionStub, Identifier, Node, NodeID, TupleType, Type};
use crate::{Block, Identifier, Node, NodeID, TupleType, Type};
use leo_span::{sym, Span, Symbol}; use leo_span::{sym, Span, Symbol};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};

4
compiler/ast/src/stub/function_stub.rs
View File

@ -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::{Annotation, Block, Finalize, Function, Identifier, Input, Node, NodeID, Output, Tuple, Type, Variant}; use crate::{Annotation, Block, Finalize, Function, Identifier, Input, Node, NodeID, Output, TupleType, Type, Variant};
use leo_span::{sym, Span, Symbol}; use leo_span::{sym, Span, Symbol};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -76,7 +76,7 @@ impl FunctionStub {
let output_type = match output.len() { let output_type = match output.len() {
0 => Type::Unit, 0 => Type::Unit,
1 => get_output_type(&output[0]), 1 => get_output_type(&output[0]),
_ => Type::Tuple(Tuple(output.iter().map(get_output_type).collect())), _ => Type::Tuple(TupleType::new(output.iter().map(get_output_type).collect())),
}; };
FunctionStub { annotations, variant, identifier, input, output, output_type, block, finalize, span, id } FunctionStub { annotations, variant, identifier, input, output, output_type, block, finalize, span, id }

5
tests/test-framework/src/error.rs
View File

@ -38,8 +38,9 @@ pub enum TestError {
impl fmt::Display for TestError { impl fmt::Display for TestError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let format_test = let format_test = |test: &str| -> String {
|test: &str| -> String { if test.len() > 50 { String::new() } else { format!("\n\n{test}\n\n") } }; if test.len() > 50 { String::new() } else { format!("\n\n{test}\n\n") }
};
match self { match self {
TestError::Panicked { test, index, error } => { TestError::Panicked { test, index, error } => {
write!(f, "test #{}: {}encountered a rust panic:\n{}", index + 1, format_test(test), error) write!(f, "test #{}: {}encountered a rust panic:\n{}", index + 1, format_test(test), error)