Fix tests.

This commit is contained in:
Stephen Chung 2020-09-13 23:13:07 +08:00 committed by J Henry Waugh
parent d57ce9c050
commit 654da2db8a
2 changed files with 22 additions and 2 deletions

View File

@ -109,7 +109,7 @@ mod module_tests {
assert_eq!(item_mod.submodules().len(), 1); assert_eq!(item_mod.submodules().len(), 1);
assert_eq!(&item_mod.submodules()[0].consts()[0].0, "MYSTIC_NUMBER"); assert_eq!(&item_mod.submodules()[0].consts()[0].0, "MYSTIC_NUMBER");
assert_eq!( assert_eq!(
item_mod.submodules()[0].consts()[0].1, item_mod.submodules()[0].consts()[0].2,
syn::parse2::<syn::Expr>(quote! { 42 }).unwrap() syn::parse2::<syn::Expr>(quote! { 42 }).unwrap()
); );
} }
@ -170,7 +170,7 @@ mod module_tests {
assert_eq!(item_mod.consts().len(), 1); assert_eq!(item_mod.consts().len(), 1);
assert_eq!(&item_mod.consts()[0].0, "MYSTIC_NUMBER"); assert_eq!(&item_mod.consts()[0].0, "MYSTIC_NUMBER");
assert_eq!( assert_eq!(
item_mod.consts()[0].1, item_mod.consts()[0].2,
syn::parse2::<syn::Expr>(quote! { 42 }).unwrap() syn::parse2::<syn::Expr>(quote! { 42 }).unwrap()
); );
} }

View File

@ -66,6 +66,9 @@ In fact, this exactly is how Rhai's built-in packages, such as `BasicMathPackage
`rhai::plugins::combine_with_exported_module!` adds all functions and constants from the `rhai::plugins::combine_with_exported_module!` adds all functions and constants from the
[plugins][plugin module] definition into the package itself. [plugins][plugin module] definition into the package itself.
All sub-modules are _flattened_ (i.e. all functions and constants defined within sub-modules are registered
at the top level) and so there will not be any sub-modules added to the package.
```rust ```rust
// Import necessary types and traits. // Import necessary types and traits.
use rhai::{ use rhai::{
@ -84,6 +87,14 @@ mod my_module {
pub fn get_num() -> i64 { pub fn get_num() -> i64 {
42 42
} }
// This is a sub-module, but if using combine_with_exported_module!, it will
// be flattened and all functions registered at the top level.
pub mod my_sub_module {
pub fn get_sub_num() -> i64 {
0
}
}
} }
// Define the package 'MyPackage'. // Define the package 'MyPackage'.
@ -96,8 +107,17 @@ def_package!(rhai:MyPackage:"My own personal super package", module, {
// Merge all registered functions and constants from the plugin module into the custom package. // Merge all registered functions and constants from the plugin module into the custom package.
// //
// Functions in the sub-module 'my_sub_module' are flattened and registered at the top level
// instead of in a sub-module.
//
// The text string name in the middle parameter can be anything and is reserved for future use; // The text string name in the middle parameter can be anything and is reserved for future use;
// it is recommended to be an ID string that uniquely identifies the module. // it is recommended to be an ID string that uniquely identifies the module.
//
// This call ends up registering three functions at the top level of the package:
// 1) greet
// 2) get_num
// 3) get_sub_num (flattened from sub-module 'my_sub_module')
//
combine_with_exported_module!(module, "my-functions", my_module)); combine_with_exported_module!(module, "my-functions", my_module));
}); });
``` ```