From e351e7fe1087889a6f70318a08255ac472b68109 Mon Sep 17 00:00:00 2001
From: Jeff Hemphill <jhemphill@fb.com>
Date: Thu, 24 Sep 2020 22:16:54 -0700
Subject: [PATCH] clang-tidy

Summary: VSCode has started showing me clang-tidy nits. When I write C++, I have a somewhat religious belief in appeasing linters and adhering to standards/guidelines, so I'm fixing them here.

Reviewed By: dneiter

Differential Revision: D23826552

fbshipit-source-id: 6014fdf7d6fad024682896cb1c3098519ce1f02c
---
 hphp/runtime/base/autoload-handler.h  | 15 ++++++++++----
 hphp/runtime/base/autoload-map.h      | 12 ++++++++++-
 hphp/runtime/base/user-autoload-map.h | 38 +++++++++++++++++------------------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/hphp/runtime/base/autoload-handler.h b/hphp/runtime/base/autoload-handler.h
index 2086a802aed..73fea2cf0ad 100644
--- a/hphp/runtime/base/autoload-handler.h
+++ b/hphp/runtime/base/autoload-handler.h
@@ -40,9 +40,12 @@ struct AutoloadMapFactory;
 
 struct AutoloadHandler final : RequestEventHandler {
 
-  AutoloadHandler() { }
-
-  ~AutoloadHandler() { }
+  AutoloadHandler() = default;
+  AutoloadHandler(const AutoloadHandler&) = delete;
+  AutoloadHandler(AutoloadHandler&&) = delete;
+  AutoloadHandler& operator=(const AutoloadHandler&) = delete;
+  AutoloadHandler& operator=(AutoloadHandler&&) noexcept = delete;
+  ~AutoloadHandler() = default;
 
   void requestInit() override;
   void requestShutdown() override;
@@ -172,6 +175,11 @@ struct FactsFactory {
   static FactsFactory* getInstance();
   static void setInstance(FactsFactory* instance);
 
+  FactsFactory() = default;
+  FactsFactory(const FactsFactory&) = default;
+  FactsFactory(FactsFactory&&) noexcept = default;
+  FactsFactory& operator=(const FactsFactory&) = default;
+  FactsFactory& operator=(FactsFactory&&) noexcept = default;
   virtual ~FactsFactory() = default;
 
   /**
@@ -182,4 +190,3 @@ struct FactsFactory {
 };
 
 }
-
diff --git a/hphp/runtime/base/autoload-map.h b/hphp/runtime/base/autoload-map.h
index 4b01ed5e369..ba356610bfa 100644
--- a/hphp/runtime/base/autoload-map.h
+++ b/hphp/runtime/base/autoload-map.h
@@ -46,6 +46,11 @@ struct AutoloadMap {
     TypeAlias,
   };
 
+  AutoloadMap() = default;
+  AutoloadMap(const AutoloadMap&) = default;
+  AutoloadMap(AutoloadMap&&) noexcept = default;
+  AutoloadMap& operator=(const AutoloadMap&) = default;
+  AutoloadMap& operator=(AutoloadMap&&) = default;
   virtual ~AutoloadMap() = default;
 
   /**
@@ -139,7 +144,12 @@ struct AutoloadMap {
  */
 struct FactsStore : public AutoloadMap {
 
-  virtual ~FactsStore() = default;
+  FactsStore() = default;
+  FactsStore(const FactsStore&) = default;
+  FactsStore(FactsStore&&) = default;
+  FactsStore& operator=(const FactsStore&) = default;
+  FactsStore& operator=(FactsStore&&) noexcept = default;
+  ~FactsStore() override = default;
 
   /**
    * Return the correctly-capitalized name of `type`.
diff --git a/hphp/runtime/base/user-autoload-map.h b/hphp/runtime/base/user-autoload-map.h
index fa97a7b1e9a..e19858f732d 100644
--- a/hphp/runtime/base/user-autoload-map.h
+++ b/hphp/runtime/base/user-autoload-map.h
@@ -53,6 +53,10 @@ struct UserAutoloadMap : AutoloadMap {
         m_typeAliasFile{std::move(typeAliasFile)},
         m_failFunc(std::move(failFunc)) {}
 
+  UserAutoloadMap(const UserAutoloadMap&) = default;
+  UserAutoloadMap(UserAutoloadMap&&) noexcept = default;
+  UserAutoloadMap& operator=(const UserAutoloadMap&) = default;
+  UserAutoloadMap& operator=(UserAutoloadMap&&) = default;
   ~UserAutoloadMap() override {
     m_root.detach();
     m_typeFile.detach();
@@ -69,36 +73,32 @@ struct UserAutoloadMap : AutoloadMap {
    * This map is not native because it gets data when userspace calls the
    * builtin function `autoload_set_paths()`.
    */
-  virtual bool isNative() const noexcept override {
+  bool isNative() const noexcept override {
     return false;
   }
 
-  virtual Array getAllFiles() const override;
+  Array getAllFiles() const override;
 
-  virtual std::optional<String> getTypeFile(
-      const String& typeName) override;
-  virtual std::optional<String> getFunctionFile(
-      const String& functionName) override;
-  virtual std::optional<String> getConstantFile(
-      const String& constantName) override;
-  virtual std::optional<String> getTypeAliasFile(
-      const String& typeAliasName) override;
+  std::optional<String> getTypeFile(const String& typeName) override;
+  std::optional<String> getFunctionFile(const String& functionName) override;
+  std::optional<String> getConstantFile(const String& constantName) override;
+  std::optional<String> getTypeAliasFile(const String& typeAliasName) override;
 
-  virtual Array getFileTypes(const String& path) override;
-  virtual Array getFileFunctions(const String& path) override;
-  virtual Array getFileConstants(const String& path) override;
-  virtual Array getFileTypeAliases(const String& path) override;
+  Array getFileTypes(const String& path) override;
+  Array getFileFunctions(const String& path) override;
+  Array getFileConstants(const String& path) override;
+  Array getFileTypeAliases(const String& path) override;
 
-  virtual bool canHandleFailure() const override {
+  bool canHandleFailure() const override {
     return !m_failFunc.isNull();
   }
-  virtual AutoloadMap::Result handleFailure(KindOf kind,
-                                            const String& className,
-                                            const Variant& err) const override;
+  AutoloadMap::Result handleFailure(KindOf kind,
+                                    const String& className,
+                                    const Variant& err) const override;
 
  private:
   std::optional<String> getFileFromMap(const Array& map,
-                                         const String& key) const;
+                                       const String& key) const;
 };
 
 //////////////////////////////////////////////////////////////////////
-- 
2.11.4.GIT