--- a/Cargo.lock +++ b/Cargo.lock @@ -112,17 +112,6 @@ ] [[package]] -name = "async-trait" -version = "0.1.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.38", -] - -[[package]] name = "autocfg" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -598,7 +587,6 @@ dependencies = [ "annotate-snippets", "anyhow", - "async-trait", "bincode", "derivative", "hashbrown 0.14.2", --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,6 @@ rustc-hash = "1.1" bincode = "1.3" annotate-snippets = "0.9.1" -async-trait = "0.1.60" num-bigint = "0.4.3" derivative = "2.2.0" strsim = "0.10.0" --- a/crates/jrsonnet-evaluator/Cargo.toml +++ b/crates/jrsonnet-evaluator/Cargo.toml @@ -14,7 +14,7 @@ # Allows library authors to throw custom errors anyhow-error = ["anyhow"] # Adds ability to build import closure in async -async-import = ["async-trait"] +async-import = [] # Allows to preserve field order in objects exp-preserve-order = [] @@ -54,8 +54,6 @@ bincode = { workspace = true, optional = true } # Explaining traces annotate-snippets = { workspace = true, features = ["color"], optional = true } -# Async imports -async-trait = { workspace = true, optional = true } # Bigint num-bigint = { workspace = true, features = ["serde"], optional = true } derivative.workspace = true --- a/crates/jrsonnet-evaluator/src/async_import.rs +++ b/crates/jrsonnet-evaluator/src/async_import.rs @@ -1,6 +1,5 @@ use std::{cell::RefCell, path::Path}; -use async_trait::async_trait; use jrsonnet_gcmodule::Trace; use jrsonnet_interner::IStr; use jrsonnet_parser::{ @@ -218,7 +217,7 @@ } } -#[async_trait(?Send)] +#[allow(async_fn_in_trait)] // we don't care about `Send` bound pub trait AsyncImportResolver { type Error; /// Resolves file path, e.g. `(/home/user/manifests, b.libjsonnet)` can correspond --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "nightly-2023-10-28" +components = ["rustfmt", "clippy"]