From 2826c24e3f0a014e3c21e142c7b6ecfef4820fc8 Mon Sep 17 00:00:00 2001
From: "Jake Bailey (Hacklang)" <jakebailey@fb.com>
Date: Mon, 5 Nov 2018 12:15:48 -0800
Subject: [PATCH] Expect hh_hot_classes.json to be under hack subdirectory.

Reviewed By: dabek

Differential Revision: D12911941

fbshipit-source-id: a62ffa2b1eb8875ab278fde7ad087035057d8e1c
---
 hphp/hack/src/server/saveStateService.ml                               | 3 ++-
 .../test/integration_ml/saved_state/test_load_decls_enum_add_member.ml | 2 +-
 .../saved_state/test_load_decls_fixme_in_hot_similar_class.ml          | 2 +-
 .../saved_state/test_load_decls_fixme_in_hot_unchanged_interface.ml    | 2 +-
 .../integration_ml/saved_state/test_load_decls_stale_derived_class.ml  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hphp/hack/src/server/saveStateService.ml b/hphp/hack/src/server/saveStateService.ml
index db67c414d62..3e1fb0877ff 100644
--- a/hphp/hack/src/server/saveStateService.ml
+++ b/hphp/hack/src/server/saveStateService.ml
@@ -137,7 +137,8 @@ let dump_contents_exn
 
 let get_hot_classes_filename () =
   let prefix = Relative_path.(path_of_prefix Root) in
-  Filename.concat prefix "hh_hot_classes.json"
+  let (/) = Filename.concat in
+  prefix / "hack" / "hh_hot_classes.json"
 
 let get_hot_classes (filename: string) : SSet.t =
   Disk.cat filename
diff --git a/hphp/hack/test/integration_ml/saved_state/test_load_decls_enum_add_member.ml b/hphp/hack/test/integration_ml/saved_state/test_load_decls_enum_add_member.ml
index f98f9d7a9bb..7ba91ae0a8c 100644
--- a/hphp/hack/test/integration_ml/saved_state/test_load_decls_enum_add_member.ml
+++ b/hphp/hack/test/integration_ml/saved_state/test_load_decls_enum_add_member.ml
@@ -31,7 +31,7 @@ let enum_switches =
   List.init 20 (fun n -> enum_switch_name n, enum_switch_contents n)
 
 let init_disk_state =
-  [ "hh_hot_classes.json", {|{"classes":[ "\\MyEnum" ]}|}
+  [ "hack/hh_hot_classes.json", {|{"classes":[ "\\MyEnum" ]}|}
   ; "my_enum.php", enum_contents ]
   @ enum_users
   @ enum_switches
diff --git a/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_similar_class.ml b/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_similar_class.ml
index 9f53e7287a2..b838c184e85 100644
--- a/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_similar_class.ml
+++ b/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_similar_class.ml
@@ -15,7 +15,7 @@ class Hot implements IFoo {%s
 }"
 
 let init_disk_state =
-  [ "hh_hot_classes.json", {|{"classes":["\\Hot"]}|}
+  [ "hack/hh_hot_classes.json", {|{"classes":["\\Hot"]}|}
   ; "ifoo.php", ifoo_contents
   ; "hot.php", hot_contents ""
   ]
diff --git a/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_unchanged_interface.ml b/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_unchanged_interface.ml
index c0838dcf201..2b52612f770 100644
--- a/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_unchanged_interface.ml
+++ b/hphp/hack/test/integration_ml/saved_state/test_load_decls_fixme_in_hot_unchanged_interface.ml
@@ -22,7 +22,7 @@ let init_disk_state =
      cold dependency of MyFoo in the same file as IFoo will cause the issue to
      disappear, since we will need to re-parse the file in order to declare the
      cold dependency. *)
-  [ "hh_hot_classes.json", {|{"classes":["\\IFoo", "\\Thing"]}|}
+  [ "hack/hh_hot_classes.json", {|{"classes":["\\IFoo", "\\Thing"]}|}
   ; "ifoo.php", ifoo_contents
   ; "my_foo.php", my_foo_contents ""
   ]
diff --git a/hphp/hack/test/integration_ml/saved_state/test_load_decls_stale_derived_class.ml b/hphp/hack/test/integration_ml/saved_state/test_load_decls_stale_derived_class.ml
index c90816d6b97..dc02360203d 100644
--- a/hphp/hack/test/integration_ml/saved_state/test_load_decls_stale_derived_class.ml
+++ b/hphp/hack/test/integration_ml/saved_state/test_load_decls_stale_derived_class.ml
@@ -55,7 +55,7 @@ let init_disk_state =
   ]
 
 let hot_classes_file hot_classes =
-  "hh_hot_classes.json",
+  "hack/hh_hot_classes.json",
   hot_classes
   |> List.map ~f:(Printf.sprintf {|"\\%s"|})
   |> String.concat ~sep:", "
-- 
2.11.4.GIT