T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wasmtime: remove drop(&mut ...) used to silence warnings (#6278)

Browse Source 
The `Config` needs to be mutable while building a compiler, but in a
build configuration without a compiler, declaring it as `mut` produces a
warning since nothing else needs that.

I found the existing workaround for this warning confusing, so this PR
removes `mut` from the binding for `config` and instead re-binds the
variable in builds where we call `build_compiler`.
This commit is contained in:
Jamey Sharp
2023-04-25 07:15:53 -07:00
committed by GitHub
parent 5113739601
commit c7b83e8ef9
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/wasmtime/src/config.rs
View File

@@ -1520,7 +1520,7 @@ impl Config {
} }
#[cfg(compiler)] #[cfg(compiler)]
pub(crate) fn build_compiler(&mut self) -> Result<Box<dyn wasmtime_environ::Compiler>> { pub(crate) fn build_compiler(mut self) -> Result<(Self, Box<dyn wasmtime_environ::Compiler>)> {
let mut compiler = match self.compiler_config.strategy { let mut compiler = match self.compiler_config.strategy {
#[cfg(feature = "cranelift")] #[cfg(feature = "cranelift")]
Strategy::Auto => wasmtime_cranelift::builder(), Strategy::Auto => wasmtime_cranelift::builder(),
@@ -1614,7 +1614,7 @@ impl Config {
compiler.enable_incremental_compilation(cache_store.clone())?; compiler.enable_incremental_compilation(cache_store.clone())?;
} }
compiler.build() Ok((self, compiler.build()?))
} }
/// Internal setting for whether adapter modules for components will have /// Internal setting for whether adapter modules for components will have

5
crates/wasmtime/src/engine.rs
View File

@@ -81,12 +81,11 @@ impl Engine {
debug_builtins::ensure_exported(); debug_builtins::ensure_exported();
let registry = SignatureRegistry::new(); let registry = SignatureRegistry::new();
let mut config = config.clone(); let config = config.clone();
config.validate()?; config.validate()?;
#[cfg(compiler)] #[cfg(compiler)]
let compiler = config.build_compiler()?; let (config, compiler) = config.build_compiler()?;
drop(&mut config); // silence warnings without `cfg(compiler)`
let allocator = config.build_allocator()?; let allocator = config.build_allocator()?;
let profiler = config.build_profiler()?; let profiler = config.build_profiler()?;