Merge pull request #119 from tomaka/fix-warnings

Fix the warnings
This commit is contained in:
tomaka 2017-01-03 15:53:01 +01:00 committed by GitHub
commit 9585f687db
2 changed files with 5 additions and 6 deletions

View File

@ -245,7 +245,7 @@ impl<'lua, L> LuaTable<L>
assert_eq!(pushed.size, 1); assert_eq!(pushed.size, 1);
pushed.forget() pushed.forget()
} }
Err((err, lua)) => { Err((err, _)) => {
return Err(CheckedSetError::ValuePushError(err)); return Err(CheckedSetError::ValuePushError(err));
} }
}; };
@ -625,7 +625,7 @@ mod tests {
fn registry_metatable() { fn registry_metatable() {
let mut lua = Lua::new(); let mut lua = Lua::new();
let mut registry = LuaTable::registry(&mut lua); let registry = LuaTable::registry(&mut lua);
let mut metatable = registry.get_or_create_metatable(); let mut metatable = registry.get_or_create_metatable();
metatable.set(3, "hello"); metatable.set(3, "hello");
} }

View File

@ -5,7 +5,6 @@ use PushGuard;
use PushOne; use PushOne;
use AsMutLua; use AsMutLua;
use TuplePushError; use TuplePushError;
use Void;
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::hash::Hash; use std::hash::Hash;
@ -23,7 +22,7 @@ fn push_iter<'lua, L, V, I, E>(mut lua: L, iterator: I) -> Result<PushGuard<L>,
for (elem, index) in iterator.zip((1..)) { for (elem, index) in iterator.zip((1..)) {
let size = match elem.push_to_lua(&mut lua) { let size = match elem.push_to_lua(&mut lua) {
Ok(pushed) => pushed.forget(), Ok(pushed) => pushed.forget(),
Err((err, lua)) => panic!(), // TODO: wrong return Err((err, lua)), // FIXME: destroy the temporary table Err((_err, _lua)) => panic!(), // TODO: wrong return Err((err, lua)), // FIXME: destroy the temporary table
}; };
match size { match size {
@ -64,7 +63,7 @@ fn push_rec_iter<'lua, L, V, I, E>(mut lua: L, iterator: I) -> Result<PushGuard<
for elem in iterator { for elem in iterator {
let size = match elem.push_to_lua(&mut lua) { let size = match elem.push_to_lua(&mut lua) {
Ok(pushed) => pushed.forget(), Ok(pushed) => pushed.forget(),
Err((err, lua)) => panic!(), // TODO: wrong return Err((err, lua)), // FIXME: destroy the temporary table Err((_err, _lua)) => panic!(), // TODO: wrong return Err((err, lua)), // FIXME: destroy the temporary table
}; };
match size { match size {
@ -154,7 +153,7 @@ impl<'lua, L, K, E> Push<L> for HashSet<K>
match push_rec_iter(lua, self.into_iter().zip(iter::repeat(true))) { match push_rec_iter(lua, self.into_iter().zip(iter::repeat(true))) {
Ok(g) => Ok(g), Ok(g) => Ok(g),
Err((TuplePushError::First(err), lua)) => Err((err, lua)), Err((TuplePushError::First(err), lua)) => Err((err, lua)),
Err((TuplePushError::Other(_), lua)) => unreachable!(), Err((TuplePushError::Other(_), _)) => unreachable!(),
} }
} }
} }