git.delta.rocks / jrsonnet / refs/commits / af49e2463154

difftreelog

style reformat new code

Лач2020-06-28parent: #7aeaa5d.patch.diff
in: master

2 files changed

modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
1pub mod location;1pub mod location;
22
3use clap::Clap;3use clap::Clap;
4use jrsonnet_evaluator::{EvaluationSettings, EvaluationState, LocError, StackTrace, Val};4use jrsonnet_evaluator::{EvaluationState, LocError, StackTrace, Val};
5use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParserSettings};5use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, LocExpr, ParserSettings};
6use location::{offset_to_location, CodeLocation};6use location::{offset_to_location, CodeLocation};
7use std::env::current_dir;7use std::env::current_dir;
modifiedcrates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
739 push(loc, "function call", body)?739 push(loc, "function call", body)?
740 }740 }
741 }741 }
742 v => create_error_result(crate::Error::OnlyFunctionsCanBeCalledGot(742 v => {
743 v.value_type()?,743 create_error_result(crate::Error::OnlyFunctionsCanBeCalledGot(v.value_type()?))?
744 ))?,744 }
745 }745 }
746 }746 }
747 Function(params, body) => evaluate_method(context, params.clone(), body.clone()),747 Function(params, body) => evaluate_method(context, params.clone(), body.clone()),
795 import_location.pop();795 import_location.pop();
796 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)796 Val::Str(with_state(|s| s.import_file_str(&import_location, path))?)
797 }797 }
798 Literal(LiteralType::Super) => {798 Literal(LiteralType::Super) => return create_error_result(crate::Error::StandaloneSuper),
799 return create_error_result(crate::Error::StandaloneSuper)
800 }
801 })799 })
802}800}
803801