Orchid/orchid
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit before working on minimal rustfmt error demo

Browse Source
This commit is contained in:
Lawrence Bethlenfalvy
2025-01-13 09:18:26 +01:00
parent e0d246fe1f
commit f1f49bab8e
8 changed files with 174 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
Cargo.lock generated
View File

@@ -168,6 +168,12 @@ dependencies = [
"pin-project-lite", "pin-project-lite",
] ]
[[package]]
name = "async-once-cell"
version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4288f83726785267c6f2ef073a3d83dc3f9b81464e9f99898240cced85fce35a"
[[package]] [[package]]
name = "async-std" name = "async-std"
version = "1.13.0" version = "1.13.0"
@@ -252,6 +258,15 @@ dependencies = [
"piper", "piper",
] ]
[[package]]
name = "blocking_semaphore"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "88376f98b48312155a0ba2f868ad705f5d5b9a1065514b1f827e31c1d2f3dbb0"
dependencies = [
"logwise",
]
[[package]] [[package]]
name = "borsh" name = "borsh"
version = "1.5.3" version = "1.5.3"
@@ -831,6 +846,24 @@ dependencies = [
"value-bag", "value-bag",
] ]
[[package]]
name = "logwise"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3f379dc0daef8061f0beab09c7d3528c1e238754e937bb640daec3553e1bceb"
dependencies = [
"logwise_proc",
"wasm-bindgen",
"web-sys",
"web-time",
]
[[package]]
name = "logwise_proc"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ba61263a12347d87ece9286fab931b7f3407b06a94ab952e676b350d7054a57"
[[package]] [[package]]
name = "memchr" name = "memchr"
version = "2.7.4" version = "2.7.4"
@@ -892,9 +925,11 @@ dependencies = [
name = "orchid-base" name = "orchid-base"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"async-once-cell",
"async-std", "async-std",
"derive_destructure", "derive_destructure",
"dyn-clone", "dyn-clone",
"futures",
"hashbrown 0.15.2", "hashbrown 0.15.2",
"itertools", "itertools",
"lazy_static", "lazy_static",
@@ -907,6 +942,7 @@ dependencies = [
"rust-embed", "rust-embed",
"rust_decimal", "rust_decimal",
"substack", "substack",
"test_executors",
"trait-set", "trait-set",
] ]
@@ -1050,6 +1086,12 @@ dependencies = [
"zerocopy", "zerocopy",
] ]
[[package]]
name = "priority"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3331288c73a29bd726cd92d947059399bf8e4b01f13d24f02caecd5187e5b5d5"
[[package]] [[package]]
name = "proc-macro-crate" name = "proc-macro-crate"
version = "3.2.0" version = "3.2.0"
@@ -1331,6 +1373,17 @@ dependencies = [
"autocfg", "autocfg",
] ]
[[package]]
name = "some_executor"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dde6a7a1595533e5bd451727a6f9c679e54160fc67a9efbaed30a9e8f7e79a01"
dependencies = [
"priority",
"wasm-bindgen",
"web-time",
]
[[package]] [[package]]
name = "stdio-perftest" name = "stdio-perftest"
version = "0.1.0" version = "0.1.0"
@@ -1386,6 +1439,31 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
[[package]]
name = "test_executors"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23ce2c67509cbc71cf72942e95a6ef76309f418fccd966b7540c96a6f6db3435"
dependencies = [
"blocking_semaphore",
"logwise",
"priority",
"some_executor",
"test_executors_proc",
"wasm-bindgen",
"web-time",
]
[[package]]
name = "test_executors_proc"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b59087b1e1332227b88c6e0ac2ca8fefccb3e2ae2caa48690a5f9cca851a2e7e"
dependencies = [
"quote 1.0.38",
"syn 2.0.95",
]
[[package]] [[package]]
name = "tinyvec" name = "tinyvec"
version = "1.8.1" version = "1.8.1"
@@ -1595,6 +1673,16 @@ dependencies = [
"wasm-bindgen", "wasm-bindgen",
] ]
[[package]]
name = "web-time"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
dependencies = [
"js-sys",
"wasm-bindgen",
]
[[package]] [[package]]
name = "winapi-util" name = "winapi-util"
version = "0.1.9" version = "0.1.9"

3
orchid-base/Cargo.toml
View File

@@ -6,9 +6,11 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
async-once-cell = "0.5.4"
async-std = "1.13.0" async-std = "1.13.0"
derive_destructure = "1.0.0" derive_destructure = "1.0.0"
dyn-clone = "1.0.17" dyn-clone = "1.0.17"
futures = "0.3.31"
hashbrown = "0.15.2" hashbrown = "0.15.2"
itertools = "0.14.0" itertools = "0.14.0"
lazy_static = "1.5.0" lazy_static = "1.5.0"
@@ -21,4 +23,5 @@ ordered-float = "4.6.0"
rust-embed = "8.5.0" rust-embed = "8.5.0"
rust_decimal = "1.36.0" rust_decimal = "1.36.0"
substack = "1.1.1" substack = "1.1.1"
test_executors = "0.3.2"
trait-set = "0.3.0" trait-set = "0.3.0"

92
orchid-base/src/interner.rs
View File

@@ -1,10 +1,12 @@
use std::borrow::Borrow; use std::borrow::Borrow;
use std::future::IntoFuture;
use std::hash::BuildHasher as _; use std::hash::BuildHasher as _;
use std::num::NonZeroU64; use std::num::NonZeroU64;
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
use std::sync::{Arc, Mutex, MutexGuard, atomic}; use std::sync::{Arc, Mutex, MutexGuard, atomic};
use std::{fmt, hash, mem}; use std::{fmt, hash, mem};
use async_once_cell::Lazy;
use hashbrown::{HashMap, HashSet}; use hashbrown::{HashMap, HashSet};
use itertools::Itertools as _; use itertools::Itertools as _;
use orchid_api_traits::{Decode, Encode, Request}; use orchid_api_traits::{Decode, Encode, Request};
@@ -25,9 +27,9 @@ pub struct Tok<T: Interned> {
impl<T: Interned> Tok<T> { impl<T: Interned> Tok<T> {
pub fn new(data: Arc<T>, marker: T::Marker) -> Self { Self { data, marker: ForceSized(marker) } } pub fn new(data: Arc<T>, marker: T::Marker) -> Self { Self { data, marker: ForceSized(marker) } }
pub fn to_api(&self) -> T::Marker { self.marker.0 } pub fn to_api(&self) -> T::Marker { self.marker.0 }
pub fn from_api<M>(marker: M) -> Self pub async fn from_api<M>(marker: M) -> Self
where M: InternMarker<Interned = T> { where M: InternMarker<Interned = T> {
deintern(marker) deintern(marker).await
} }
pub fn arc(&self) -> Arc<T> { self.data.clone() } pub fn arc(&self) -> Arc<T> { self.data.clone() }
} }
@@ -68,7 +70,7 @@ impl<T: Interned + Decode> Decode for Tok<T> {
pub trait Interned: Eq + hash::Hash + Clone + fmt::Debug + Internable<Interned = Self> { pub trait Interned: Eq + hash::Hash + Clone + fmt::Debug + Internable<Interned = Self> {
type Marker: InternMarker<Interned = Self> + Sized; type Marker: InternMarker<Interned = Self> + Sized;
fn intern( async fn intern(
self: Arc<Self>, self: Arc<Self>,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Self::Marker; ) -> Self::Marker;
@@ -82,7 +84,7 @@ pub trait Internable: fmt::Debug {
pub trait InternMarker: Copy + PartialEq + Eq + PartialOrd + Ord + hash::Hash + Sized { pub trait InternMarker: Copy + PartialEq + Eq + PartialOrd + Ord + hash::Hash + Sized {
type Interned: Interned<Marker = Self>; type Interned: Interned<Marker = Self>;
fn resolve( async fn resolve(
self, self,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Tok<Self::Interned>; ) -> Tok<Self::Interned>;
@@ -92,21 +94,21 @@ pub trait InternMarker: Copy + PartialEq + Eq + PartialOrd + Ord + hash::Hash +
impl Interned for String { impl Interned for String {
type Marker = api::TStr; type Marker = api::TStr;
fn intern( async fn intern(
self: Arc<Self>, self: Arc<Self>,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Self::Marker { ) -> Self::Marker {
req.request(api::InternStr(self)) req.request(api::InternStr(self)).await
} }
fn bimap(interners: &mut TypedInterners) -> &mut Bimap<Self> { &mut interners.strings } fn bimap(interners: &mut TypedInterners) -> &mut Bimap<Self> { &mut interners.strings }
} }
impl InternMarker for api::TStr { impl InternMarker for api::TStr {
type Interned = String; type Interned = String;
fn resolve( async fn resolve(
self, self,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Tok<Self::Interned> { ) -> Tok<Self::Interned> {
Tok::new(req.request(api::ExternStr(self)), self) Tok::new(req.request(api::ExternStr(self)).await, self)
} }
fn get_id(self) -> NonZeroU64 { self.0 } fn get_id(self) -> NonZeroU64 { self.0 }
fn from_id(id: NonZeroU64) -> Self { Self(id) } fn from_id(id: NonZeroU64) -> Self { Self(id) }
@@ -122,22 +124,22 @@ impl Internable for String {
impl Interned for Vec<Tok<String>> { impl Interned for Vec<Tok<String>> {
type Marker = api::TStrv; type Marker = api::TStrv;
fn intern( async fn intern(
self: Arc<Self>, self: Arc<Self>,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Self::Marker { ) -> Self::Marker {
req.request(api::InternStrv(Arc::new(self.iter().map(|t| t.to_api()).collect()))) req.request(api::InternStrv(Arc::new(self.iter().map(|t| t.to_api()).collect()))).await
} }
fn bimap(interners: &mut TypedInterners) -> &mut Bimap<Self> { &mut interners.vecs } fn bimap(interners: &mut TypedInterners) -> &mut Bimap<Self> { &mut interners.vecs }
} }
impl InternMarker for api::TStrv { impl InternMarker for api::TStrv {
type Interned = Vec<Tok<String>>; type Interned = Vec<Tok<String>>;
fn resolve( async fn resolve(
self, self,
req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized), req: &(impl DynRequester<Transfer = api::IntReq> + ?Sized),
) -> Tok<Self::Interned> { ) -> Tok<Self::Interned> {
let data = let data =
Arc::new(req.request(api::ExternStrv(self)).iter().map(|m| deintern(*m)).collect_vec()); Arc::new(req.request(api::ExternStrv(self)).await.iter().map(|m| deintern(*m)).collect_vec());
Tok::new(data, self) Tok::new(data, self)
} }
fn get_id(self) -> NonZeroU64 { self.0 } fn get_id(self) -> NonZeroU64 { self.0 }
@@ -151,18 +153,18 @@ impl Internable for Vec<Tok<String>> {
type Interned = Vec<Tok<String>>; type Interned = Vec<Tok<String>>;
fn get_owned(&self) -> Arc<Self::Interned> { Arc::new(self.to_vec()) } fn get_owned(&self) -> Arc<Self::Interned> { Arc::new(self.to_vec()) }
} }
impl Internable for Vec<api::TStr> { // impl Internable for Vec<api::TStr> {
type Interned = Vec<Tok<String>>; // type Interned = Vec<Tok<String>>;
fn get_owned(&self) -> Arc<Self::Interned> { // fn get_owned(&self) -> Arc<Self::Interned> {
Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) // Arc::new(self.iter().map(|ts| deintern(*ts)).collect())
} // }
} // }
impl Internable for [api::TStr] { // impl Internable for [api::TStr] {
type Interned = Vec<Tok<String>>; // type Interned = Vec<Tok<String>>;
fn get_owned(&self) -> Arc<Self::Interned> { // fn get_owned(&self) -> Arc<Self::Interned> {
Arc::new(self.iter().map(|ts| deintern(*ts)).collect()) // Arc::new(self.iter().map(|ts| deintern(*ts)).collect())
} // }
} // }
/// The number of references held to any token by the interner. /// The number of references held to any token by the interner.
const BASE_RC: usize = 3; const BASE_RC: usize = 3;
@@ -258,7 +260,7 @@ pub fn init_replica(req: impl DynRequester<Transfer = api::IntReq> + 'static) {
}) })
} }
pub fn intern<T: Interned>(t: &(impl Internable<Interned = T> + ?Sized)) -> Tok<T> { pub async fn intern<T: Interned>(t: &(impl Internable<Interned = T> + ?Sized)) -> Tok<T> {
let data = t.get_owned(); let data = t.get_owned();
let mut g = interner(); let mut g = interner();
let job = format!("{t:?} in {}", if g.master.is_some() { "replica" } else { "master" }); let job = format!("{t:?} in {}", if g.master.is_some() { "replica" } else { "master" });
@@ -268,7 +270,7 @@ pub fn intern<T: Interned>(t: &(impl Internable<Interned = T> + ?Sized)) -> Tok<
return tok; return tok;
} }
let marker = match &mut g.master { let marker = match &mut g.master {
Some(c) => data.clone().intern(&**c), Some(c) => data.clone().intern(&**c).await,
None => None =>
T::Marker::from_id(NonZeroU64::new(ID.fetch_add(1, atomic::Ordering::Relaxed)).unwrap()), T::Marker::from_id(NonZeroU64::new(ID.fetch_add(1, atomic::Ordering::Relaxed)).unwrap()),
}; };
@@ -279,13 +281,13 @@ pub fn intern<T: Interned>(t: &(impl Internable<Interned = T> + ?Sized)) -> Tok<
tok tok
} }
fn deintern<M: InternMarker>(marker: M) -> Tok<M::Interned> { async fn deintern<M: InternMarker>(marker: M) -> Tok<M::Interned> {
let mut g = interner(); let mut g = interner();
if let Some(tok) = M::Interned::bimap(&mut g.interners).by_marker(marker) { if let Some(tok) = M::Interned::bimap(&mut g.interners).by_marker(marker) {
return tok; return tok;
} }
let master = g.master.as_mut().expect("ID not in local interner and this is master"); let master = g.master.as_mut().expect("ID not in local interner and this is master");
let token = marker.resolve(&**master); let token = marker.resolve(&**master).await;
M::Interned::bimap(&mut g.interners).insert(token.clone()); M::Interned::bimap(&mut g.interners).insert(token.clone());
token token
} }
@@ -311,16 +313,29 @@ pub fn sweep_replica() -> api::Retained {
#[macro_export] #[macro_export]
macro_rules! intern { macro_rules! intern {
($ty:ty : $expr:expr) => {{ ($ty:ty : $expr:expr) => {{
use std::future::Future;
use std::pin::Pin;
type Interned = <$ty as $crate::interner::Internable>::Interned;
type Output = $crate::interner::Tok<Interned>;
type InternFuture = Pin<Box<dyn Future<Output = Output>>>;
thread_local! { thread_local! {
static VALUE: $crate::interner::Tok<<$ty as $crate::interner::Internable>::Interned> static VALUE:
= $crate::interner::intern::< Pin<std::rc::Rc<async_once_cell::Lazy<Output, InternFuture>>> =
<$ty as $crate::interner::Internable>::Interned std::rc::Rc::pin(async_once_cell::Lazy::new(Box::pin(async {
>($expr as &$ty); $crate::interner::intern::<Interned>($expr as &$ty).await
}) as InternFuture));
} }
VALUE.with(|v| v.clone()) VALUE.with(|val| {
let val: Pin<std::rc::Rc<async_once_cell::Lazy<Output, InternFuture>>> = val.clone();
async move { val.as_ref().await.deref().clone() }
})
}}; }};
} }
pub async fn scratch() -> String {
Arc::pin(Lazy::new(async { "foobar".to_string() })).as_ref().await.deref().clone()
}
pub fn sweep_master(retained: api::Retained) { pub fn sweep_master(retained: api::Retained) {
let mut g = interner(); let mut g = interner();
assert!(g.master.is_none(), "Not master"); assert!(g.master.is_none(), "Not master");
@@ -333,17 +348,18 @@ mod test {
use std::num::NonZero; use std::num::NonZero;
use orchid_api_traits::{Decode, enc_vec}; use orchid_api_traits::{Decode, enc_vec};
use test_executors::spin_on;
use super::*; use super::*;
use crate::api; use crate::api;
#[test] #[test]
fn test_i() { fn test_i() {
let _: Tok<String> = intern!(str: "foo"); let _: Tok<String> = spin_on(intern!(str: "foo"));
let _: Tok<Vec<Tok<String>>> = intern!([Tok<String>]: &[ let _: Tok<Vec<Tok<String>>> = spin_on(intern!([Tok<String>]: &[
intern!(str: "bar"), spin_on(intern!(str: "bar")),
intern!(str: "baz") spin_on(intern!(str: "baz"))
]); ]));
} }
#[test] #[test]

11
orchid-base/src/name.rs
View File

@@ -436,11 +436,12 @@ impl NameLike for VName {}
/// cloning the token. /// cloning the token.
#[macro_export] #[macro_export]
macro_rules! sym { macro_rules! sym {
($seg1:tt $( :: $seg:tt)*) => { ($seg1:tt $( :: $seg:tt)*) => { async {
$crate::name::Sym::from_tok($crate::intern!([$crate::interner::Tok<String>]: &[ $crate::name::Sym::from_tok($crate::intern!([$crate::interner::Tok<String>]: &[
$crate::intern!(str: stringify!($seg1)) $crate::intern!(str: stringify!($seg1)).await
$( , $crate::intern!(str: stringify!($seg)) )* $( , $crate::intern!(str: stringify!($seg)).await )*
])).unwrap() ])).unwrap()
}
}; };
(@NAME $seg:tt) => {} (@NAME $seg:tt) => {}
} }

27
orchid-base/src/reqnot.rs
View File

@@ -24,7 +24,7 @@ trait_set! {
for<'a> FnMut(&'a [u8], ReqNot<T>) -> Pin<Box<dyn Future<Output = ()> + 'a>> for<'a> FnMut(&'a [u8], ReqNot<T>) -> Pin<Box<dyn Future<Output = ()> + 'a>>
+ DynClone + Send + 'static; + DynClone + Send + 'static;
pub trait ReqFn<T: MsgSet> = pub trait ReqFn<T: MsgSet> =
for<'a> FnMut(RequestHandle<T>, <T::In as Channel>::Req) -> Pin<Box<dyn Future<Output = Receipt>>> for<'a> FnMut(RequestHandle<'a, T>, <T::In as Channel>::Req) -> Pin<Box<dyn Future<Output = Receipt<'a>>>>
+ DynClone + Send + Sync + 'static; + DynClone + Send + Sync + 'static;
pub trait NotifFn<T: MsgSet> = pub trait NotifFn<T: MsgSet> =
for<'a> FnMut(<T::In as Channel>::Notif, ReqNot<T>) -> Pin<Box<dyn Future<Output = ()>>> for<'a> FnMut(<T::In as Channel>::Notif, ReqNot<T>) -> Pin<Box<dyn Future<Output = ()>>>
@@ -213,6 +213,7 @@ mod test {
use async_std::future; use async_std::future;
use orchid_api_derive::Coding; use orchid_api_derive::Coding;
use orchid_api_traits::{Channel, Request}; use orchid_api_traits::{Channel, Request};
use test_executors::spin_on;
use super::{MsgSet, ReqNot}; use super::{MsgSet, ReqNot};
use crate::clone; use crate::clone;
@@ -248,9 +249,9 @@ mod test {
|_, _| panic!("Not receiving a request"), |_, _| panic!("Not receiving a request"),
); );
let sender = ReqNot::<TestMsgSet>::new( let sender = ReqNot::<TestMsgSet>::new(
clone!(receiver; move |d, _| Box::pin(async { clone!(receiver; move |d, _| clone!(receiver; Box::pin(async move {
receiver.receive(d).await receiver.receive(d).await
})), }))),
|_, _| panic!("Should not receive notif"), |_, _| panic!("Should not receive notif"),
|_, _| panic!("Should not receive request"), |_, _| panic!("Should not receive request"),
); );
@@ -264,25 +265,23 @@ mod test {
fn request() { fn request() {
let receiver = Arc::new(Mutex::<Option<ReqNot<TestMsgSet>>>::new(None)); let receiver = Arc::new(Mutex::<Option<ReqNot<TestMsgSet>>>::new(None));
let sender = Arc::new(ReqNot::<TestMsgSet>::new( let sender = Arc::new(ReqNot::<TestMsgSet>::new(
{ clone!(receiver; move |d, _| clone!(receiver; Box::pin(async move {
let receiver = receiver.clone(); receiver.lock().unwrap().as_ref().unwrap().receive(d).await
move |d, _| receiver.lock().unwrap().as_ref().unwrap().receive(d) }))),
},
|_, _| panic!("Should not receive notif"), |_, _| panic!("Should not receive notif"),
|_, _| panic!("Should not receive request"), |_, _| panic!("Should not receive request"),
)); ));
*receiver.lock().unwrap() = Some(ReqNot::new( *receiver.lock().unwrap() = Some(ReqNot::new(
{ clone!(sender; move |d, _| clone!(sender; Box::pin(async move { sender.receive(d).await }))),
let sender = sender.clone();
move |d, _| sender.receive(d)
},
|_, _| panic!("Not receiving notifs"), |_, _| panic!("Not receiving notifs"),
|hand, req| { |hand, req| {
assert_eq!(req, TestReq(5)); Box::pin(async move {
hand.respond(&6u8) assert_eq!(req, TestReq(5));
hand.respond(&6u8).await
})
}, },
)); ));
let response = sender.request(TestReq(5)); let response = spin_on(sender.request(TestReq(5)));
assert_eq!(response, 6); assert_eq!(response, 6);
} }
} }

4
orchid-host/src/subprocess.rs
View File

@@ -74,8 +74,6 @@ impl ExtPort for Subprocess {
send_msg(&mut *self.stdin.lock().unwrap(), msg).unwrap() send_msg(&mut *self.stdin.lock().unwrap(), msg).unwrap()
} }
fn recv<'a>(&self, cb: Box<dyn FnOnce(&[u8]) + Send + 'a>) -> futures::future::BoxFuture<()> { fn recv<'a>(&self, cb: Box<dyn FnOnce(&[u8]) + Send + 'a>) -> futures::future::BoxFuture<()> {
async { async {}
}
} }
} }

2
rustfmt.toml
View File

@@ -7,7 +7,7 @@ style_edition = "2024"
tab_spaces = 2 tab_spaces = 2
hard_tabs = true hard_tabs = true
max_width = 100 max_width = 100
error_on_line_overflow = true #error_on_line_overflow = true
error_on_unformatted = true error_on_unformatted = true
format_macro_matchers = true format_macro_matchers = true
newline_style = "Unix" newline_style = "Unix"

15
xtask/src/main.rs
View File

@@ -31,14 +31,15 @@ fn main() -> io::Result<ExitCode> {
let mut contents = String::new(); let mut contents = String::new();
File::open(file.path())?.read_to_string(&mut contents)?; File::open(file.path())?.read_to_string(&mut contents)?;
for (l, line) in contents.lines().enumerate() { for (l, line) in contents.lines().enumerate() {
if line.trim().starts_with("use") { if !line.trim().starts_with("use") {
if let Some(c) = line.find("orchid_api") { continue;
if Some(c) != line.find("orchid_api_") {
let dname = file.path().to_string_lossy().to_string();
eprintln!("orchid_api imported in {dname} at {};{}", l + 1, c + 1)
}
}
} }
let Some(c) = line.find("orchid_api") else { continue };
if Some(c) == line.find("orchid_api_") {
continue;
}
let dname = file.path().to_string_lossy().to_string();
eprintln!("orchid_api imported in {dname} at {};{}", l + 1, c + 1)
} }
} }
Ok(()) Ok(())