From c768ef4ca984a5cd83b8008d25551c08efda3bc6 Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Mon, 11 Oct 2021 17:56:22 +0800 Subject: [PATCH 1/2] Bump version. --- CHANGELOG.md | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87f55f4b..1b6e69f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Rhai Release Notes ================== +Version 1.1.1 +============= + + Version 1.1.0 ============= @@ -60,10 +64,6 @@ Enhancements * `StaticVec` is changed to keep three items inline instead of four. -Version 1.0.7 -============= - - Version 1.0.6 ============= diff --git a/Cargo.toml b/Cargo.toml index 52e61ab6..c59fe1bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [".", "codegen"] [package] name = "rhai" -version = "1.1.0" +version = "1.1.1" edition = "2018" authors = ["Jonathan Turner", "Lukáš Hozda", "Stephen Chung", "jhwgh1968"] description = "Embedded scripting for Rust" @@ -20,7 +20,7 @@ smallvec = { version = "1.6", default-features = false, features = ["union"] } ahash = { version = "0.7", default-features = false } num-traits = { version = "0.2", default-features = false } smartstring = { version = "0.2.7", default-features = false } -rhai_codegen = { version = "1.0", path = "codegen", default-features = false } +rhai_codegen = { version = "1.1", path = "codegen", default-features = false } [features] default = ["ahash/std", "num-traits/std"] From 4e965c3f3f57f87c02c7547b7224cf07bb753487 Mon Sep 17 00:00:00 2001 From: Stephen Chung Date: Sat, 23 Oct 2021 17:49:52 +0800 Subject: [PATCH 2/2] Fix no_module+internals build. --- CHANGELOG.md | 5 +++++ src/ast.rs | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b6e69f2..4cda46a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Rhai Release Notes Version 1.1.1 ============= +Bug fixes +--------- + +* The `no_module` and `internals` features now work together without a compilation error. + Version 1.1.0 ============= diff --git a/src/ast.rs b/src/ast.rs index 3e1cd195..34d492a5 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -717,8 +717,7 @@ impl AST { /// /// Not available under `no_function`. #[cfg(not(feature = "no_function"))] - #[cfg(not(feature = "no_module"))] - #[inline(always)] + #[inline] pub(crate) fn iter_fn_def(&self) -> impl Iterator { self.functions .iter_script_fn()