Rename `to_lua_err` -> `into_lua_err`

This commit is contained in:
Alex Orlenko 2023-01-06 21:35:15 +00:00
parent 16cbb442e5
commit 8339621f9c
No known key found for this signature in database
GPG Key ID: 4C150C250863B96D
6 changed files with 15 additions and 15 deletions

View File

@ -12,7 +12,7 @@ impl UserData for BodyReader {
methods.add_async_function("read", |lua, reader: AnyUserData| async move {
let mut reader = reader.borrow_mut::<Self>()?;
if let Some(bytes) = reader.0.data().await {
let bytes = bytes.to_lua_err()?;
let bytes = bytes.into_lua_err()?;
return Some(lua.create_string(&bytes)).transpose();
}
Ok(None)
@ -26,8 +26,8 @@ async fn main() -> Result<()> {
let fetch_url = lua.create_async_function(|lua, uri: String| async move {
let client = HyperClient::new();
let uri = uri.parse().to_lua_err()?;
let resp = client.get(uri).await.to_lua_err()?;
let uri = uri.parse().into_lua_err()?;
let resp = client.get(uri).await.into_lua_err()?;
let lua_resp = lua.create_table()?;
lua_resp.set("status", resp.status().as_u16())?;
@ -37,7 +37,7 @@ async fn main() -> Result<()> {
headers
.entry(key.as_str())
.or_insert(Vec::new())
.push(value.to_str().to_lua_err()?);
.push(value.to_str().into_lua_err()?);
}
lua_resp.set("headers", headers)?;

View File

@ -10,8 +10,8 @@ async fn main() -> Result<()> {
let resp = reqwest::get(&uri)
.await
.and_then(|resp| resp.error_for_status())
.to_lua_err()?;
let json = resp.json::<serde_json::Value>().await.to_lua_err()?;
.into_lua_err()?;
let json = resp.json::<serde_json::Value>().await.into_lua_err()?;
lua.to_value(&json)
})?;

View File

@ -306,25 +306,25 @@ impl Error {
}
pub trait ExternalError {
fn to_lua_err(self) -> Error;
fn into_lua_err(self) -> Error;
}
impl<E: Into<Box<dyn StdError + Send + Sync>>> ExternalError for E {
fn to_lua_err(self) -> Error {
fn into_lua_err(self) -> Error {
Error::external(self)
}
}
pub trait ExternalResult<T> {
fn to_lua_err(self) -> Result<T>;
fn into_lua_err(self) -> Result<T>;
}
impl<T, E> ExternalResult<T> for StdResult<T, E>
where
E: ExternalError,
{
fn to_lua_err(self) -> Result<T> {
self.map_err(|e| e.to_lua_err())
fn into_lua_err(self) -> Result<T> {
self.map_err(|e| e.into_lua_err())
}
}

View File

@ -35,5 +35,5 @@ fn rust_module2(lua: &Lua) -> LuaResult<LuaTable> {
#[mlua::lua_module]
fn rust_module_error(_: &Lua) -> LuaResult<LuaTable> {
Err("custom module error".to_lua_err())
Err("custom module error".into_lua_err())
}

View File

@ -308,7 +308,7 @@ fn test_error() -> Result<()> {
.exec()?;
let rust_error_function =
lua.create_function(|_, ()| -> Result<()> { Err(TestError.to_lua_err()) })?;
lua.create_function(|_, ()| -> Result<()> { Err(TestError.into_lua_err()) })?;
globals.set("rust_error_function", rust_error_function)?;
let no_error = globals.get::<_, Function>("no_error")?;
@ -506,7 +506,7 @@ fn test_result_conversions() -> Result<()> {
let err = lua.create_function(|_, ()| {
Ok(Err::<String, _>(
"only through failure can we succeed".to_lua_err(),
"only through failure can we succeed".into_lua_err(),
))
})?;
let ok = lua.create_function(|_, ()| Ok(Ok::<_, Error>("!".to_owned())))?;

View File

@ -122,7 +122,7 @@ fn test_metamethods() -> Result<()> {
if index.to_str()? == "inner" {
Ok(data.0)
} else {
Err("no such custom index".to_lua_err())
Err("no such custom index".into_lua_err())
}
});
#[cfg(any(