michael/mlua
michael
/
mlua
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replace _: () with () everywhere

This commit is contained in:
kyren 2017-08-01 14:09:47 -04:00
parent 8e9c93b9d1
commit f44917ff83
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/examples.rs
View File

@ -127,7 +127,7 @@ fn examples() -> Result<()> {
impl UserData for Vec2 { impl UserData for Vec2 {
fn add_methods(methods: &mut UserDataMethods<Self>) { fn add_methods(methods: &mut UserDataMethods<Self>) {
methods.add_method("magnitude", |_, vec, _: ()| { methods.add_method("magnitude", |_, vec, ()| {
let mag_squared = vec.0 * vec.0 + vec.1 * vec.1; let mag_squared = vec.0 * vec.0 + vec.1 * vec.1;
Ok(mag_squared.sqrt()) Ok(mag_squared.sqrt())
}); });

22
src/tests.rs
View File

@ -220,7 +220,7 @@ fn test_rust_function() {
).unwrap(); ).unwrap();
let lua_function = globals.get::<_, Function>("lua_function").unwrap(); let lua_function = globals.get::<_, Function>("lua_function").unwrap();
let rust_function = lua.create_function(|_, _: ()| Ok("hello")); let rust_function = lua.create_function(|_, ()| Ok("hello"));
globals.set("rust_function", rust_function).unwrap(); globals.set("rust_function", rust_function).unwrap();
assert_eq!(lua_function.call::<_, String>(()).unwrap(), "hello"); assert_eq!(lua_function.call::<_, String>(()).unwrap(), "hello");
@ -254,7 +254,7 @@ fn test_methods() {
impl UserData for MyUserData { impl UserData for MyUserData {
fn add_methods(methods: &mut UserDataMethods<Self>) { fn add_methods(methods: &mut UserDataMethods<Self>) {
methods.add_method("get_value", |_, data, _: ()| Ok(data.0)); methods.add_method("get_value", |_, data, ()| Ok(data.0));
methods.add_method_mut("set_value", |_, data, args| { methods.add_method_mut("set_value", |_, data, args| {
data.0 = args; data.0 = args;
Ok(()) Ok(())
@ -294,7 +294,7 @@ fn test_metamethods() {
impl UserData for MyUserData { impl UserData for MyUserData {
fn add_methods(methods: &mut UserDataMethods<Self>) { fn add_methods(methods: &mut UserDataMethods<Self>) {
methods.add_method("get", |_, data, _: ()| Ok(data.0)); methods.add_method("get", |_, data, ()| Ok(data.0));
methods.add_meta_function(MetaMethod::Add, |_, (lhs, rhs): (MyUserData, MyUserData)| { methods.add_meta_function(MetaMethod::Add, |_, (lhs, rhs): (MyUserData, MyUserData)| {
Ok(MyUserData(lhs.0 + rhs.0)) Ok(MyUserData(lhs.0 + rhs.0))
}); });
@ -481,7 +481,7 @@ fn test_error() {
).unwrap(); ).unwrap();
let rust_error_function = let rust_error_function =
lua.create_function(|_, _: ()| -> Result<()> { Err(TestError.to_lua_err()) }); lua.create_function(|_, ()| -> Result<()> { Err(TestError.to_lua_err()) });
globals globals
.set("rust_error_function", rust_error_function) .set("rust_error_function", rust_error_function)
.unwrap(); .unwrap();
@ -540,7 +540,7 @@ fn test_error() {
"#, "#,
None, None,
)?; )?;
let rust_panic_function = lua.create_function(|_, _: ()| -> Result<()> { let rust_panic_function = lua.create_function(|_, ()| -> Result<()> {
panic!("expected panic, this panic should be caught in rust") panic!("expected panic, this panic should be caught in rust")
}); });
globals.set("rust_panic_function", rust_panic_function)?; globals.set("rust_panic_function", rust_panic_function)?;
@ -566,7 +566,7 @@ fn test_error() {
"#, "#,
None, None,
)?; )?;
let rust_panic_function = lua.create_function(|_, _: ()| -> Result<()> { let rust_panic_function = lua.create_function(|_, ()| -> Result<()> {
panic!("expected panic, this panic should be caught in rust") panic!("expected panic, this panic should be caught in rust")
}); });
globals.set("rust_panic_function", rust_panic_function)?; globals.set("rust_panic_function", rust_panic_function)?;
@ -723,12 +723,12 @@ fn test_result_conversions() {
let lua = Lua::new(); let lua = Lua::new();
let globals = lua.globals(); let globals = lua.globals();
let err = lua.create_function(|_, _: ()| { let err = lua.create_function(|_, ()| {
Ok(Err::<String, _>( Ok(Err::<String, _>(
"only through failure can we succeed".to_lua_err(), "only through failure can we succeed".to_lua_err(),
)) ))
}); });
let ok = lua.create_function(|_, _: ()| Ok(Ok::<_, Error>("!".to_owned()))); let ok = lua.create_function(|_, ()| Ok(Ok::<_, Error>("!".to_owned())));
globals.set("err", err).unwrap(); globals.set("err", err).unwrap();
globals.set("ok", ok).unwrap(); globals.set("ok", ok).unwrap();
@ -780,7 +780,7 @@ fn test_expired_userdata() {
impl UserData for MyUserdata { impl UserData for MyUserdata {
fn add_methods(methods: &mut UserDataMethods<Self>) { fn add_methods(methods: &mut UserDataMethods<Self>) {
methods.add_method("access", |_, this, _: ()| { methods.add_method("access", |_, this, ()| {
assert!(this.id == 123); assert!(this.id == 123);
Ok(()) Ok(())
}); });
@ -869,7 +869,7 @@ fn string_views() {
#[test] #[test]
fn coroutine_from_closure() { fn coroutine_from_closure() {
let lua = Lua::new(); let lua = Lua::new();
let thrd_main = lua.create_function(|_, _: ()| Ok(())); let thrd_main = lua.create_function(|_, ()| Ok(()));
lua.globals().set("main", thrd_main).unwrap(); lua.globals().set("main", thrd_main).unwrap();
let thrd: Thread = lua.eval("coroutine.create(main)", None).unwrap(); let thrd: Thread = lua.eval("coroutine.create(main)", None).unwrap();
thrd.resume::<_, ()>(()).unwrap(); thrd.resume::<_, ()>(()).unwrap();
@ -879,7 +879,7 @@ fn coroutine_from_closure() {
#[should_panic] #[should_panic]
fn coroutine_panic() { fn coroutine_panic() {
let lua = Lua::new(); let lua = Lua::new();
let thrd_main = lua.create_function(|lua, _: ()| { let thrd_main = lua.create_function(|lua, ()| {
// whoops, 'main' has a wrong type // whoops, 'main' has a wrong type
let _coro: u32 = lua.globals().get("main").unwrap(); let _coro: u32 = lua.globals().get("main").unwrap();
Ok(()) Ok(())