Topiary v0.2.3 (#23)

.cargo/config.toml

@@ -14,6 +14,10 @@ replace-with = "vendored-sources"
 git = "https://github.com/tree-sitter/tree-sitter-bash"
 replace-with = "vendored-sources"
 
+[source."git+https://github.com/tree-sitter/tree-sitter-ocaml"]
+git = "https://github.com/tree-sitter/tree-sitter-ocaml"
+replace-with = "vendored-sources"
+
 [source."git+https://github.com/tweag/tree-sitter-facade"]
 git = "https://github.com/tweag/tree-sitter-facade"
 replace-with = "vendored-sources"

.github/actions/run-tests/action.yml

@@ -26,11 +26,11 @@ runs:
       run: |
         ## Test on OCaml implementation files (.ml)
         cat ${{ inputs.samples }}/input/ocaml.ml                               \
-            | ${{ inputs.topiary }} --language ocaml-implementation            \
+            | ${{ inputs.topiary }} --language ocaml                           \
             > ocaml.ml
         diff ${{ inputs.samples }}/expected/ocaml.ml ocaml.ml
         ## Test on OCaml interface files (.mli)
-        cat ${{ inputs.samples }}/input/ocaml.mli                              \
+        cat ${{ inputs.samples }}/input/ocaml-interface.mli                    \
             | ${{ inputs.topiary }} --language ocaml-interface                 \
-            > ocaml.mli
-        diff ${{ inputs.samples }}/expected/ocaml.mli ocaml.mli
+            > ocaml-interface.mli
+        diff ${{ inputs.samples }}/expected/ocaml-interface.mli ocaml-interface.mli

.gitignore

@@ -7,3 +7,4 @@ tmp/
 *~
 *#
 target/
+/.pre-commit-config.yaml

Cargo.toml

@@ -5,7 +5,7 @@ members = ["topiary/topiary-cli"]
 ## Everything below this point is copied from `topiary/Cargo.toml`.
 
 [workspace.package]
-version = "0.2.2"
+version = "0.2.3"
 edition = "2021"
 authors = ["Tweag"]
 homepage = "https://topiary.tweag.io"
@@ -23,6 +23,7 @@ assert_cmd = "2.0"
 cfg-if = "1.0.0"
 clap = "4.3"
 criterion = "0.4"
+directories = "5.0"
 env_logger = "0.10"
 futures = "0.3.28"
 itertools = "0.10"
@@ -31,6 +32,7 @@ pretty_assertions = "1.3"
 prettydiff = "0.6.4"
 regex = "1.8.2"
 serde = "1.0.163"
+serde-toml-merge = "0.3"
 serde_json = "1.0"
 tempfile = "3.5.0"
 test-log = "0.2.11"
@@ -41,7 +43,7 @@ tree-sitter-bash = { git = "https://github.com/tree-sitter/tree-sitter-bash" }
 tree-sitter-facade = { git = "https://github.com/tweag/tree-sitter-facade" }
 tree-sitter-json = "0.19"
 tree-sitter-nickel = { git = "https://github.com/nickel-lang/tree-sitter-nickel", rev = "b1a4718601ebd29a62bf3a7fd1069a99ccf48093" }
-tree-sitter-ocaml = "0.20.2"
+tree-sitter-ocaml = { git = "https://github.com/tree-sitter/tree-sitter-ocaml" }
 tree-sitter-query = { git = "https://github.com/nvim-treesitter/tree-sitter-query" }
 tree-sitter-rust = "0.20.3"
 tree-sitter-toml = "0.20.0"

README.md

@@ -103,15 +103,13 @@ How to update
 
 - Update the [Git submodule] containing Topiary. Make sure it is checked out at
   a tag of your choosing:
-  ```console
-  $ git submodule update --remote
-  Submodule path 'topiary': checked out 'f99bcd59e2a247e04b31b16fc9214460012e3713'
-  ```
-
-- Make sure the Git submodule is checked out at a tag of your choosing:
   ```console
   $ cd topiary
   $ git fetch
+  remote: Enumerating objects: 299, done.
+  [...]
+  From ssh://github.com/tweag/topiary
+   * [new tag] v0.1.0 -> v0.1.0
   $ git checkout v0.1.0
   HEAD is now at c4fe76c GraphViz visualisation support (#326)
   $ cd ..
@@ -137,16 +135,8 @@ How to update
   `topiary/Cargo.toml` file, except for the `workspace.members` attribute. This
   step should include bumping the version number.
 
-- Refresh the `Cargo.lock` file:
-  ```console
-  $ cargo update
-      Updating crates.io index
-      Updating git repository `https://github.com/tree-sitter/tree-sitter-bash`
-      Updating git submodule `https://git.savannah.gnu.org/git/bash.git`
-  [...]
-      Updating git repository `https://github.com/nvim-treesitter/tree-sitter-query`
-  ```
-  This may take a couple of minutes.
+- Update the `Cargo.lock` file. Again, this usually consists in copying the one
+  from `topiary/Cargo.lock`.
 
 - Regenerate the `vendor/` directory:
   ```console

vendor/crossbeam-epoch/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"fb7137e9387e107a35cb94b8ef2312e37066797f13ec24fae82e6265bd68ce34","Cargo.lock":"da576c190d52b8da0b2e23cfd23218c207f78a5f01b9fe2e44f6377669c7222b","Cargo.toml":"7c03d7a6b0655f7b4f15888ac25a78136acf456ec02e2a5647162ca1179c0a25","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"901be3c21843440be5c456ff049f57f72ee5ec365918a772ad2a4751e52f69c5","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"5f75132808d9e8d6e266fe77f9e20bbc35855a1c37a5dbc0940b3e989bca1a94","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"092c49e65d5f0ccad8c868b9bcaf431b580c98b7efed98c3797d82d0b9d0c471","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"f4439909152d38c03b6dfb6eeba6c9f07c39962187d461c92a492c27c258670b","src/internal.rs":"ac40ce276f0ed3dfd561926b78f775592eabb90790e177edde41fe50c13b8256","src/lib.rs":"a036d73230d0574011e67be11d275fe46439a1b5fc3295cb242d9179e5e0a220","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"326e32489d467e974c441120640a8338aa55da55c24b20276075ce9053997326","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"}
+{"files":{"CHANGELOG.md":"41aadd10f28a79ac9a8f8960ed1d9b01b2c637a9c5d16c44632794ea154b195b","Cargo.lock":"6347500366837bb0270a958edbeaf955d148ffe9eaad4a4903cbb078e3d50852","Cargo.toml":"e829a9a24e8c67f588cc33360c98ecee410bb33204eab021d5a29e1c9370c342","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"5734ed989dfca1f625b40281ee9f4530f91b2411ec01cb748223e7eb87e201ab","README.md":"d67d0cf57751a019707dd95785345ee181a10ea80237789bc3c19bf28c0d45ca","benches/defer.rs":"c330b704d96b2ad1aed29f72c37a99da534adef8cb06a3976d5f93bf567abb20","benches/flush.rs":"0389ac6c473632f0e93c962f223404cc360257f6699b4ec90b9b3be16bb6d74f","benches/pin.rs":"2f649a5153745c7930efdb32a52f9dc522f7b8cf548a251c5e2c82ee25dc3fff","build-common.rs":"502cb7494549bed6fa10ac7bea36e880eeb60290dc69b679ac5c92b376469562","build.rs":"901be3c21843440be5c456ff049f57f72ee5ec365918a772ad2a4751e52f69c5","examples/sanitize.rs":"a39d1635fa61e643e59192d7a63becc97ff81f03c1f4e03d38cedefb1525026a","no_atomic.rs":"c291992d273abba165579ada7873c34ce4f3674363a7c1ec092be856beac0355","src/atomic.rs":"1bd4275c1411852024533e8a70959dfedf72029e3253544d1fbb0cc18b6fd519","src/collector.rs":"29e5911f61510247659b0090517bd1a38d11e1ed86e35811603cb599962d9a58","src/default.rs":"62edf5e1f934eb82d8d7f010d6f25366e6851145a6f0a162372202bb63da1f3a","src/deferred.rs":"0c87df5797212778edd3c2d5fcf0cc04e8b9ed100261ecf9522f74a90804a3d5","src/epoch.rs":"d31e66d8fe62299928e25867336d96391b26a4fe890a1cae0885dfcf36d6835b","src/guard.rs":"f4439909152d38c03b6dfb6eeba6c9f07c39962187d461c92a492c27c258670b","src/internal.rs":"ac40ce276f0ed3dfd561926b78f775592eabb90790e177edde41fe50c13b8256","src/lib.rs":"a036d73230d0574011e67be11d275fe46439a1b5fc3295cb242d9179e5e0a220","src/sync/list.rs":"10aa4c59845ab9ff1d8bcb6f594b70bbe23c320fa7a2b125fdf85df88b9d61e2","src/sync/mod.rs":"326e32489d467e974c441120640a8338aa55da55c24b20276075ce9053997326","src/sync/once_lock.rs":"c03dc9c05a817e087dccf8b682f7307501542805533551da3c2bab442bc40743","src/sync/queue.rs":"06173b2255677d0d39178ceb49876fda2878f491e907c595eb65643dbb43c9ba","tests/loom.rs":"db772f4478966de6ec98774ca4093171dc942da635822a0d2d3257d31188cb9b"},"package":"46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695"}

vendor/crossbeam-epoch/CHANGELOG.md

@@ -1,7 +1,3 @@
-# Version 0.9.15
-
-- Update `memoffset` to 0.9. (#981)
-
 # Version 0.9.14
 
 - Update `memoffset` to 0.8. (#955)