Skip to content

Commit b62f2ee

Browse files
chore: make clippy happy (#388)
Co-authored-by: hzlinyiyu <hzlinyiyu@corp.netease.com>
1 parent 6e6c73e commit b62f2ee

File tree

9 files changed

+18
-22
lines changed

9 files changed

+18
-22
lines changed

mlua-sys/src/lua51/compat.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//!
33
//! Based on github.com/keplerproject/lua-compat-5.3
44
5-
use std::convert::TryInto;
65
use std::mem;
76
use std::os::raw::{c_char, c_int, c_void};
87
use std::ptr;

mlua-sys/src/lua52/compat.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//!
33
//! Based on github.com/keplerproject/lua-compat-5.3
44
5-
use std::convert::TryInto;
65
use std::os::raw::{c_char, c_int, c_void};
76
use std::ptr;
87

mlua_derive/src/token.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use std::{
22
cmp::{Eq, PartialEq},
33
fmt::{self, Display, Formatter},
4-
iter::IntoIterator,
54
vec::IntoIter,
65
};
76

src/conversion.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use std::borrow::Cow;
22
use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
3-
use std::convert::TryInto;
43
use std::ffi::{CStr, CString};
54
use std::hash::{BuildHasher, Hash};
65
use std::os::raw::c_int;
@@ -67,7 +66,8 @@ impl<'lua> IntoLua<'lua> for &String<'lua> {
6766

6867
#[inline]
6968
unsafe fn push_into_stack(self, lua: &'lua Lua) -> Result<()> {
70-
Ok(lua.push_ref(&self.0))
69+
lua.push_ref(&self.0);
70+
Ok(())
7171
}
7272
}
7373

@@ -131,7 +131,8 @@ impl<'lua> IntoLua<'lua> for &Table<'lua> {
131131

132132
#[inline]
133133
unsafe fn push_into_stack(self, lua: &'lua Lua) -> Result<()> {
134-
Ok(lua.push_ref(&self.0))
134+
lua.push_ref(&self.0);
135+
Ok(())
135136
}
136137
}
137138

@@ -196,7 +197,8 @@ impl<'lua> IntoLua<'lua> for &Function<'lua> {
196197

197198
#[inline]
198199
unsafe fn push_into_stack(self, lua: &'lua Lua) -> Result<()> {
199-
Ok(lua.push_ref(&self.0))
200+
lua.push_ref(&self.0);
201+
Ok(())
200202
}
201203
}
202204

@@ -261,7 +263,8 @@ impl<'lua> IntoLua<'lua> for &Thread<'lua> {
261263

262264
#[inline]
263265
unsafe fn push_into_stack(self, lua: &'lua Lua) -> Result<()> {
264-
Ok(lua.push_ref(&self.0))
266+
lua.push_ref(&self.0);
267+
Ok(())
265268
}
266269
}
267270

@@ -326,7 +329,8 @@ impl<'lua> IntoLua<'lua> for &AnyUserData<'lua> {
326329

327330
#[inline]
328331
unsafe fn push_into_stack(self, lua: &'lua Lua) -> Result<()> {
329-
Ok(lua.push_ref(&self.0))
332+
lua.push_ref(&self.0);
333+
Ok(())
330334
}
331335
}
332336

src/luau/package.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ pub(crate) fn register_package_module(lua: &Lua) -> Result<()> {
103103
Ok(())
104104
}
105105

106+
#[allow(unused_variables)]
106107
pub(crate) fn disable_dylibs(lua: &Lua) {
107108
// Presence of `LoadedDylibs` in app data is used as a flag
108109
// to check whether binary modules are enabled

src/multi.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use std::iter::FromIterator;
21
use std::ops::{Deref, DerefMut};
32
use std::os::raw::c_int;
43
use std::result::Result as StdResult;

src/serde/de.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use std::cell::RefCell;
2-
use std::convert::TryInto;
32
use std::os::raw::c_void;
43
use std::rc::Rc;
54
use std::result::Result as StdResult;
@@ -134,9 +133,7 @@ impl<'lua, 'de> serde::Deserializer<'de> for Deserializer<'lua> {
134133
Value::Nil => visitor.visit_unit(),
135134
Value::Boolean(b) => visitor.visit_bool(b),
136135
#[allow(clippy::useless_conversion)]
137-
Value::Integer(i) => {
138-
visitor.visit_i64(i.try_into().expect("cannot convert lua_Integer to i64"))
139-
}
136+
Value::Integer(i) => visitor.visit_i64(i.into()),
140137
#[allow(clippy::useless_conversion)]
141138
Value::Number(n) => visitor.visit_f64(n.into()),
142139
#[cfg(feature = "luau")]

src/serde/ser.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,7 @@ impl<'lua> ser::SerializeStruct for SerializeStruct<'lua> {
535535
Some(table @ Value::Table(_)) => Ok(table),
536536
Some(value) if self.options.detect_serde_json_arbitrary_precision => {
537537
let number_s = value.as_str().expect("not an arbitrary precision number");
538-
if number_s.contains(&['.', 'e', 'E']) {
538+
if number_s.contains(['.', 'e', 'E']) {
539539
if let Ok(number) = number_s.parse().map(Value::Number) {
540540
return Ok(number);
541541
}
@@ -544,7 +544,7 @@ impl<'lua> ser::SerializeStruct for SerializeStruct<'lua> {
544544
.parse()
545545
.map(Value::Integer)
546546
.or_else(|_| number_s.parse().map(Value::Number))
547-
.unwrap_or_else(|_| value))
547+
.unwrap_or(value))
548548
}
549549
_ => unreachable!(),
550550
}

src/value.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use std::borrow::Cow;
22
use std::cmp::Ordering;
33
use std::collections::HashSet;
4-
use std::iter::{self, FromIterator};
4+
use std::iter;
55
use std::ops::Index;
66
use std::os::raw::{c_int, c_void};
77
use std::string::String as StdString;
@@ -15,7 +15,7 @@ use {
1515
crate::table::SerializableTable,
1616
rustc_hash::FxHashSet,
1717
serde::ser::{self, Serialize, Serializer},
18-
std::{cell::RefCell, convert::TryInto, rc::Rc, result::Result as StdResult},
18+
std::{cell::RefCell, rc::Rc, result::Result as StdResult},
1919
};
2020

2121
use crate::error::{Error, Result};
@@ -252,8 +252,7 @@ impl<'lua> Value<'lua> {
252252
/// If the value is a Lua [`Integer`], try to convert it to `i64` or return `None` otherwise.
253253
#[inline]
254254
pub fn as_i64(&self) -> Option<i64> {
255-
#[allow(clippy::useless_conversion)]
256-
self.as_integer().and_then(|i| i64::try_from(i).ok())
255+
self.as_integer().map(i64::from)
257256
}
258257

259258
/// Cast the value to `u64`.
@@ -659,8 +658,7 @@ impl<'a, 'lua> Serialize for SerializableValue<'a, 'lua> {
659658
Value::Nil => serializer.serialize_unit(),
660659
Value::Boolean(b) => serializer.serialize_bool(*b),
661660
#[allow(clippy::useless_conversion)]
662-
Value::Integer(i) => serializer
663-
.serialize_i64((*i).try_into().expect("cannot convert Lua Integer to i64")),
661+
Value::Integer(i) => serializer.serialize_i64((*i).into()),
664662
Value::Number(n) => serializer.serialize_f64(*n),
665663
#[cfg(feature = "luau")]
666664
Value::Vector(v) => v.serialize(serializer),

0 commit comments

Comments
 (0)