Merge branch 'v1.1-fixes'
This commit is contained in:
commit
76ac24dd85
@ -1,10 +1,11 @@
|
|||||||
#[cfg(not(feature = "serde"))]
|
#[cfg(any(not(feature = "serde"), feature = "no_object"))]
|
||||||
fn main() {
|
fn main() {
|
||||||
println!("This example requires the 'serde' feature to run.");
|
println!("This example requires the 'serde' feature to run.");
|
||||||
println!("Try: cargo run --features serde --example serde");
|
println!("Try: cargo run --features serde --example serde");
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "serde")]
|
#[cfg(feature = "serde")]
|
||||||
|
#[cfg(not(feature = "no_object"))]
|
||||||
fn main() {
|
fn main() {
|
||||||
example::ser();
|
example::ser();
|
||||||
println!();
|
println!();
|
||||||
@ -12,6 +13,7 @@ fn main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "serde")]
|
#[cfg(feature = "serde")]
|
||||||
|
#[cfg(not(feature = "no_object"))]
|
||||||
mod example {
|
mod example {
|
||||||
use rhai::serde::{from_dynamic, to_dynamic};
|
use rhai::serde::{from_dynamic, to_dynamic};
|
||||||
use rhai::{Dynamic, Engine, Map};
|
use rhai::{Dynamic, Engine, Map};
|
||||||
|
Loading…
Reference in New Issue
Block a user