enabled warnings

This commit is contained in:
Svyatoslav Nikolsky
2017-04-27 14:44:03 +03:00
parent af2c6a3e08
commit c2aef456a5
7 changed files with 32 additions and 19 deletions

View File

@ -27,13 +27,14 @@ impl ProgramInstance {
}
/// Instantiate module.
pub fn add_module(&self, name: &str, module: Module) -> Result<(), Error> {
pub fn add_module(&self, name: &str, module: Module) -> Result<Arc<ModuleInstance>, Error> {
let mut modules = self.essence.modules.write();
match modules.entry(name.into()) {
Entry::Occupied(_) => Err(Error::Program(format!("module {} already instantiated", name))),
Entry::Vacant(entry) => {
entry.insert(Arc::new(ModuleInstance::new(Arc::downgrade(&self.essence), module)?));
Ok(())
let module_instance = Arc::new(ModuleInstance::new(Arc::downgrade(&self.essence), module)?);
entry.insert(module_instance.clone());
Ok(module_instance)
},
}
}