Bring missing changes to 0.58-stable branch

This reverts commit b864e7e63e.
This commit is contained in:
Mike Grabowski
2019-01-28 14:56:57 +01:00
parent a289b7efb0
commit 9d19ab0c0c
130 changed files with 2583 additions and 1107 deletions
+3 -3
View File
@@ -90,13 +90,13 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
if (it == modulesByName_.end()) {
if (unknownModules_.find(name) != unknownModules_.end()) {
return nullptr;
return folly::none;
}
if (!moduleNotFoundCallback_ ||
!moduleNotFoundCallback_(name) ||
(it = modulesByName_.find(name)) == modulesByName_.end()) {
unknownModules_.insert(name);
return nullptr;
return folly::none;
}
}
size_t index = it->second;
@@ -143,7 +143,7 @@ folly::Optional<ModuleConfig> ModuleRegistry::getConfig(const std::string& name)
if (config.size() == 2 && config[1].empty()) {
// no constants or methods
return nullptr;
return folly::none;
} else {
return ModuleConfig{index, config};
}