mirror of
https://github.com/sagiegurari/duckscript
synced 2024-10-02 22:24:40 +00:00
rust upgrade
This commit is contained in:
parent
09b794b1d1
commit
ab567dcf08
12
Cargo.lock
generated
12
Cargo.lock
generated
|
@ -542,9 +542,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "libc"
|
||||
version = "0.2.110"
|
||||
version = "0.2.109"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b58a4469763e4e3a906c4ed786e1c70512d16aa88f84dded826da42640fc6a1c"
|
||||
checksum = "f98a04dce437184842841303488f70d0188c5f51437d2a834dc097eafa909a01"
|
||||
|
||||
[[package]]
|
||||
name = "log"
|
||||
|
@ -718,9 +718,9 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
|
|||
|
||||
[[package]]
|
||||
name = "pkg-config"
|
||||
version = "0.3.23"
|
||||
version = "0.3.24"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d1a3ea4f0dd7f1f3e512cf97bf100819aa547f36a6eccac8dbaae839eb92363e"
|
||||
checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe"
|
||||
|
||||
[[package]]
|
||||
name = "ppv-lite86"
|
||||
|
@ -842,9 +842,9 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.6"
|
||||
version = "1.0.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568"
|
||||
checksum = "254df5081ce98661a883445175e52efe99d1cb2a5552891d965d2f5d0cad1c16"
|
||||
|
||||
[[package]]
|
||||
name = "same-file"
|
||||
|
|
|
@ -4,7 +4,7 @@ version = "0.7.1"
|
|||
authors = ["Sagie Gur-Ari <sagiegurari@gmail.com>"]
|
||||
description = "Simple, extendable and embeddable scripting language."
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
edition = "2021"
|
||||
documentation = "https://sagiegurari.github.io/duckscript/api/duckscript/index.html"
|
||||
homepage = "http://github.com/sagiegurari/duckscript"
|
||||
repository = "https://github.com/sagiegurari/duckscript.git"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
asm_sub_register,
|
||||
bad_asm_style,
|
||||
bindings_with_variant_name,
|
||||
break_with_label_and_loop,
|
||||
cenum_impl_drop_cast,
|
||||
clashing_extern_declarations,
|
||||
coherence_leak_check,
|
||||
|
@ -17,11 +18,15 @@
|
|||
const_item_mutation,
|
||||
dead_code,
|
||||
deprecated,
|
||||
deprecated_cfg_attr_crate_type_name,
|
||||
deprecated_in_future,
|
||||
deref_into_dyn_supertrait,
|
||||
deref_nullptr,
|
||||
drop_bounds,
|
||||
duplicate_macro_attributes,
|
||||
dyn_drop,
|
||||
ellipsis_inclusive_range_patterns,
|
||||
enum_intrinsics_non_enums,
|
||||
explicit_outlives_requirements,
|
||||
exported_private_dependencies,
|
||||
forbidden_lint_groups,
|
||||
|
@ -35,6 +40,7 @@
|
|||
indirect_structural_match,
|
||||
ineffective_unstable_trait_impl,
|
||||
inline_no_sanitize,
|
||||
invalid_atomic_ordering,
|
||||
invalid_doc_attributes,
|
||||
invalid_type_param_default,
|
||||
invalid_value,
|
||||
|
@ -52,6 +58,7 @@
|
|||
mixed_script_confusables,
|
||||
mutable_borrow_reservation_conflict,
|
||||
mutable_transmutes,
|
||||
named_asm_labels,
|
||||
no_mangle_const_items,
|
||||
no_mangle_generic_items,
|
||||
non_ascii_idents,
|
||||
|
@ -81,6 +88,8 @@
|
|||
soft_unstable,
|
||||
stable_features,
|
||||
temporary_cstring_as_ptr,
|
||||
text_direction_codepoint_in_comment,
|
||||
text_direction_codepoint_in_literal,
|
||||
trivial_bounds,
|
||||
trivial_casts,
|
||||
trivial_numeric_casts,
|
||||
|
@ -104,6 +113,7 @@
|
|||
unsupported_naked_functions,
|
||||
unused_allocation,
|
||||
unused_assignments,
|
||||
unused_assignments,
|
||||
unused_attributes,
|
||||
unused_braces,
|
||||
unused_comparisons,
|
||||
|
@ -122,7 +132,9 @@
|
|||
unused_qualifications,
|
||||
unused_unsafe,
|
||||
unused_variables,
|
||||
useless_deprecated
|
||||
useless_deprecated,
|
||||
where_clauses_object_safety,
|
||||
while_true
|
||||
)]
|
||||
#![warn(macro_use_extern_crate, unknown_lints)]
|
||||
#![allow(
|
||||
|
|
|
@ -4,7 +4,7 @@ version = "0.8.10"
|
|||
authors = ["Sagie Gur-Ari <sagiegurari@gmail.com>"]
|
||||
description = "The duckscript command line executable."
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
edition = "2021"
|
||||
documentation = "https://sagiegurari.github.io/duckscript/api/duckscript/index.html"
|
||||
homepage = "http://github.com/sagiegurari/duckscript"
|
||||
repository = "https://github.com/sagiegurari/duckscript.git"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
asm_sub_register,
|
||||
bad_asm_style,
|
||||
bindings_with_variant_name,
|
||||
break_with_label_and_loop,
|
||||
cenum_impl_drop_cast,
|
||||
clashing_extern_declarations,
|
||||
coherence_leak_check,
|
||||
|
@ -17,11 +18,15 @@
|
|||
const_item_mutation,
|
||||
dead_code,
|
||||
deprecated,
|
||||
deprecated_cfg_attr_crate_type_name,
|
||||
deprecated_in_future,
|
||||
deref_into_dyn_supertrait,
|
||||
deref_nullptr,
|
||||
drop_bounds,
|
||||
duplicate_macro_attributes,
|
||||
dyn_drop,
|
||||
ellipsis_inclusive_range_patterns,
|
||||
enum_intrinsics_non_enums,
|
||||
explicit_outlives_requirements,
|
||||
exported_private_dependencies,
|
||||
forbidden_lint_groups,
|
||||
|
@ -35,6 +40,7 @@
|
|||
indirect_structural_match,
|
||||
ineffective_unstable_trait_impl,
|
||||
inline_no_sanitize,
|
||||
invalid_atomic_ordering,
|
||||
invalid_doc_attributes,
|
||||
invalid_type_param_default,
|
||||
invalid_value,
|
||||
|
@ -52,6 +58,7 @@
|
|||
mixed_script_confusables,
|
||||
mutable_borrow_reservation_conflict,
|
||||
mutable_transmutes,
|
||||
named_asm_labels,
|
||||
no_mangle_const_items,
|
||||
no_mangle_generic_items,
|
||||
non_ascii_idents,
|
||||
|
@ -81,6 +88,8 @@
|
|||
soft_unstable,
|
||||
stable_features,
|
||||
temporary_cstring_as_ptr,
|
||||
text_direction_codepoint_in_comment,
|
||||
text_direction_codepoint_in_literal,
|
||||
trivial_bounds,
|
||||
trivial_casts,
|
||||
trivial_numeric_casts,
|
||||
|
@ -104,6 +113,7 @@
|
|||
unsupported_naked_functions,
|
||||
unused_allocation,
|
||||
unused_assignments,
|
||||
unused_assignments,
|
||||
unused_attributes,
|
||||
unused_braces,
|
||||
unused_comparisons,
|
||||
|
@ -122,7 +132,9 @@
|
|||
unused_qualifications,
|
||||
unused_unsafe,
|
||||
unused_variables,
|
||||
useless_deprecated
|
||||
useless_deprecated,
|
||||
where_clauses_object_safety,
|
||||
while_true
|
||||
)]
|
||||
#![warn(macro_use_extern_crate, unknown_lints)]
|
||||
#![allow(
|
||||
|
|
|
@ -4,7 +4,7 @@ version = "0.8.10"
|
|||
authors = ["Sagie Gur-Ari <sagiegurari@gmail.com>"]
|
||||
description = "The duckscript SDK."
|
||||
license = "Apache-2.0"
|
||||
edition = "2018"
|
||||
edition = "2021"
|
||||
documentation = "https://sagiegurari.github.io/duckscript/api/duckscript/index.html"
|
||||
homepage = "http://github.com/sagiegurari/duckscript"
|
||||
repository = "https://github.com/sagiegurari/duckscript.git"
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
asm_sub_register,
|
||||
bad_asm_style,
|
||||
bindings_with_variant_name,
|
||||
break_with_label_and_loop,
|
||||
cenum_impl_drop_cast,
|
||||
clashing_extern_declarations,
|
||||
coherence_leak_check,
|
||||
|
@ -17,11 +18,15 @@
|
|||
const_item_mutation,
|
||||
dead_code,
|
||||
deprecated,
|
||||
deprecated_cfg_attr_crate_type_name,
|
||||
deprecated_in_future,
|
||||
deref_into_dyn_supertrait,
|
||||
deref_nullptr,
|
||||
drop_bounds,
|
||||
duplicate_macro_attributes,
|
||||
dyn_drop,
|
||||
ellipsis_inclusive_range_patterns,
|
||||
enum_intrinsics_non_enums,
|
||||
explicit_outlives_requirements,
|
||||
exported_private_dependencies,
|
||||
forbidden_lint_groups,
|
||||
|
@ -35,6 +40,7 @@
|
|||
indirect_structural_match,
|
||||
ineffective_unstable_trait_impl,
|
||||
inline_no_sanitize,
|
||||
invalid_atomic_ordering,
|
||||
invalid_doc_attributes,
|
||||
invalid_type_param_default,
|
||||
invalid_value,
|
||||
|
@ -52,6 +58,7 @@
|
|||
mixed_script_confusables,
|
||||
mutable_borrow_reservation_conflict,
|
||||
mutable_transmutes,
|
||||
named_asm_labels,
|
||||
no_mangle_const_items,
|
||||
no_mangle_generic_items,
|
||||
non_ascii_idents,
|
||||
|
@ -81,6 +88,8 @@
|
|||
soft_unstable,
|
||||
stable_features,
|
||||
temporary_cstring_as_ptr,
|
||||
text_direction_codepoint_in_comment,
|
||||
text_direction_codepoint_in_literal,
|
||||
trivial_bounds,
|
||||
trivial_casts,
|
||||
trivial_numeric_casts,
|
||||
|
@ -104,6 +113,7 @@
|
|||
unsupported_naked_functions,
|
||||
unused_allocation,
|
||||
unused_assignments,
|
||||
unused_assignments,
|
||||
unused_attributes,
|
||||
unused_braces,
|
||||
unused_comparisons,
|
||||
|
@ -122,7 +132,9 @@
|
|||
unused_qualifications,
|
||||
unused_unsafe,
|
||||
unused_variables,
|
||||
useless_deprecated
|
||||
useless_deprecated,
|
||||
where_clauses_object_safety,
|
||||
while_true
|
||||
)]
|
||||
#![warn(macro_use_extern_crate, unknown_lints)]
|
||||
#![allow(
|
||||
|
|
|
@ -78,7 +78,7 @@ enum LookingFor {
|
|||
|
||||
pub(crate) fn run_with_connection(
|
||||
arguments: &Vec<String>,
|
||||
func: &mut FnMut(&Options, &mut FtpStream) -> CommandResult,
|
||||
func: &mut dyn FnMut(&Options, &mut FtpStream) -> CommandResult,
|
||||
) -> CommandResult {
|
||||
validate_and_run_with_connection(
|
||||
arguments,
|
||||
|
@ -89,8 +89,8 @@ pub(crate) fn run_with_connection(
|
|||
|
||||
pub(crate) fn validate_and_run_with_connection(
|
||||
arguments: &Vec<String>,
|
||||
validate_input: &Fn(&Options) -> Result<(), String>,
|
||||
func: &mut FnMut(&Options, &mut FtpStream) -> CommandResult,
|
||||
validate_input: &dyn Fn(&Options) -> Result<(), String>,
|
||||
func: &mut dyn FnMut(&Options, &mut FtpStream) -> CommandResult,
|
||||
) -> CommandResult {
|
||||
match parse_common_options(&arguments) {
|
||||
Ok(options) => match validate_input(&options) {
|
||||
|
@ -196,7 +196,7 @@ fn parse_common_options(arguments: &Vec<String>) -> Result<Options, String> {
|
|||
|
||||
fn run_in_ftp_connection_context(
|
||||
options: &Options,
|
||||
func: &mut FnMut(&mut FtpStream) -> CommandResult,
|
||||
func: &mut dyn FnMut(&mut FtpStream) -> CommandResult,
|
||||
) -> CommandResult {
|
||||
match options.host {
|
||||
Some(ref host) => {
|
||||
|
|
Loading…
Reference in a new issue