summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Orlenko <zxteam@protonmail.com>2023-07-10 01:16:27 +0100
committerAlex Orlenko <zxteam@protonmail.com>2023-07-10 01:16:27 +0100
commit6b8b79266f278a366ade4a82503fb76c2c8e65a2 (patch)
tree10d46716caa51e9a82bae0e37749cac5bc1fe02d
parent08ab685d8de716bc5a8454726486995baeef8ca3 (diff)
downloadmlua-6b8b79266f278a366ade4a82503fb76c2c8e65a2.zip
Drop futures-timer dev-dependency
-rw-r--r--Cargo.toml1
-rw-r--r--src/function.rs3
-rw-r--r--src/lua.rs3
-rw-r--r--tests/async.rs43
4 files changed, 25 insertions, 25 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 8dc297b..92ff33f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -64,7 +64,6 @@ futures = "0.3.5"
hyper = { version = "0.14", features = ["client", "server"] }
reqwest = { version = "0.11", features = ["json"] }
tokio = { version = "1.0", features = ["full"] }
-futures-timer = "3.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
maplit = "1.0"
diff --git a/src/function.rs b/src/function.rs
index 37ebc01..b992584 100644
--- a/src/function.rs
+++ b/src/function.rs
@@ -167,14 +167,13 @@ impl<'lua> Function<'lua> {
///
/// ```
/// use std::time::Duration;
- /// use futures_timer::Delay;
/// # use mlua::{Lua, Result};
/// # #[tokio::main]
/// # async fn main() -> Result<()> {
/// # let lua = Lua::new();
///
/// let sleep = lua.create_async_function(move |_lua, n: u64| async move {
- /// Delay::new(Duration::from_millis(n)).await;
+ /// tokio::time::sleep(Duration::from_millis(n)).await;
/// Ok(())
/// })?;
///
diff --git a/src/lua.rs b/src/lua.rs
index 5c80acf..41ea047 100644
--- a/src/lua.rs
+++ b/src/lua.rs
@@ -1601,11 +1601,10 @@ impl Lua {
///
/// ```
/// use std::time::Duration;
- /// use futures_timer::Delay;
/// use mlua::{Lua, Result};
///
/// async fn sleep(_lua: &Lua, n: u64) -> Result<&'static str> {
- /// Delay::new(Duration::from_millis(n)).await;
+ /// tokio::time::sleep(Duration::from_millis(n)).await;
/// Ok("done")
/// }
///
diff --git a/tests/async.rs b/tests/async.rs
index 7a5c492..e747033 100644
--- a/tests/async.rs
+++ b/tests/async.rs
@@ -3,7 +3,6 @@
use std::sync::{Arc, Mutex};
use std::time::Duration;
-use futures_timer::Delay;
use futures_util::stream::TryStreamExt;
use mlua::{
@@ -11,6 +10,10 @@ use mlua::{
UserDataMethods, Value,
};
+async fn sleep_ms(ms: u64) {
+ tokio::time::sleep(Duration::from_millis(ms)).await;
+}
+
#[tokio::test]
async fn test_async_function() -> Result<()> {
let lua = Lua::new();
@@ -43,7 +46,7 @@ async fn test_async_sleep() -> Result<()> {
let lua = Lua::new();
let sleep = lua.create_async_function(move |_lua, n: u64| async move {
- Delay::new(Duration::from_millis(n)).await;
+ sleep_ms(n).await;
Ok(format!("elapsed:{}ms", n))
})?;
lua.globals().set("sleep", sleep)?;
@@ -59,7 +62,7 @@ async fn test_async_call() -> Result<()> {
let lua = Lua::new();
let hello = lua.create_async_function(|_lua, name: String| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
Ok(format!("hello, {}!", name))
})?;
@@ -102,7 +105,7 @@ async fn test_async_handle_yield() -> Result<()> {
let lua = Lua::new();
let sum = lua.create_async_function(|_lua, (a, b): (i64, i64)| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
Ok(a + b)
})?;
@@ -160,10 +163,10 @@ async fn test_async_return_async_closure() -> Result<()> {
let lua = Lua::new();
let f = lua.create_async_function(|lua, a: i64| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
let g = lua.create_async_function(move |_, b: i64| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
return Ok(a + b);
})?;
@@ -253,7 +256,7 @@ async fn test_async_thread() -> Result<()> {
let f = lua.create_async_function(move |_lua, ()| {
let cnt3 = cnt2.clone();
async move {
- Delay::new(Duration::from_millis(*cnt3.as_ref())).await;
+ sleep_ms(*cnt3.as_ref()).await;
Ok("done")
}
})?;
@@ -296,19 +299,19 @@ async fn test_async_table() -> Result<()> {
table.set("val", 10)?;
let get_value = lua.create_async_function(|_, table: Table| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
table.get::<_, i64>("val")
})?;
table.set("get_value", get_value)?;
let set_value = lua.create_async_function(|_, (table, n): (Table, i64)| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
table.set("val", n)
})?;
table.set("set_value", set_value)?;
let sleep = lua.create_async_function(|_, n| async move {
- Delay::new(Duration::from_millis(n)).await;
+ sleep_ms(n).await;
Ok(format!("elapsed:{}ms", n))
})?;
table.set("sleep", sleep)?;
@@ -336,12 +339,12 @@ async fn test_async_thread_pool() -> Result<()> {
let lua = Lua::new_with(StdLib::ALL_SAFE, options)?;
let error_f = lua.create_async_function(|_, ()| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
Err::<(), _>(Error::RuntimeError("test".to_string()))
})?;
let sleep = lua.create_async_function(|_, n| async move {
- Delay::new(Duration::from_millis(n)).await;
+ sleep_ms(n).await;
Ok(format!("elapsed:{}ms", n))
})?;
@@ -359,25 +362,25 @@ async fn test_async_userdata() -> Result<()> {
impl UserData for MyUserData {
fn add_methods<'lua, M: UserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_async_method("get_value", |_, data, ()| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
Ok(data.0)
});
methods.add_async_method_mut("set_value", |_, data, n| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
data.0 = n;
Ok(())
});
methods.add_async_function("sleep", |_, n| async move {
- Delay::new(Duration::from_millis(n)).await;
+ sleep_ms(n).await;
Ok(format!("elapsed:{}ms", n))
});
#[cfg(not(any(feature = "lua51", feature = "luau")))]
methods.add_async_meta_method(mlua::MetaMethod::Call, |_, data, ()| async move {
let n = data.0;
- Delay::new(Duration::from_millis(n)).await;
+ sleep_ms(n).await;
Ok(format!("elapsed:{}ms", n))
});
@@ -385,7 +388,7 @@ async fn test_async_userdata() -> Result<()> {
methods.add_async_meta_method(
mlua::MetaMethod::Index,
|_, data, key: String| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
match key.as_str() {
"ms" => Ok(Some(data.0 as f64)),
"s" => Ok(Some((data.0 as f64) / 1000.0)),
@@ -398,7 +401,7 @@ async fn test_async_userdata() -> Result<()> {
methods.add_async_meta_method_mut(
mlua::MetaMethod::NewIndex,
|_, data, (key, value): (String, f64)| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
match key.as_str() {
"ms" => data.0 = value as u64,
"s" => data.0 = (value * 1000.0) as u64,
@@ -485,7 +488,7 @@ async fn test_owned_async_call() -> Result<()> {
let hello = lua
.create_async_function(|_, name: String| async move {
- Delay::new(Duration::from_millis(10)).await;
+ sleep_ms(10).await;
Ok(format!("hello, {}!", name))
})?
.into_owned();
@@ -506,7 +509,7 @@ async fn test_async_terminate() -> Result<()> {
let mutex = mutex2.clone();
async move {
let _guard = mutex.lock();
- Delay::new(Duration::from_millis(100)).await;
+ sleep_ms(100).await;
Ok(())
}
})?;