Merge branch 'main' into attribute.declare-with-attr-loc

ocaml-ppx · Mar 14, 2023 · e394211 · e394211
2 parents 0241b9a + 3006ef6
commit e394211
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,6 +3,8 @@ unreleased
 
 - Add `Attribute.declare_with_attr_loc` (#396, @dvulakh)
 
+- Add "ns" and "res" as reserved namespaces(#388, @davesnx)
+
 0.29.1 (14/02/2023)
 ------------------
 

diff --git a/src/name.ml b/src/name.ml
@@ -118,7 +118,9 @@ module Reserved_namespaces = struct
   let reserve ns = Hashtbl.add_exn tbl ~key:ns ~data:()
   let () = reserve "merlin"
   let () = reserve "reason"
-  let () = reserve "refmt"
+  let () = reserve "refmt" (* reason *)
+  let () = reserve "ns" (* rescript *)
+  let () = reserve "res" (* rescript *)
   let () = reserve "metaocaml"
   let () = reserve "ocamlformat"