Merge branch 'main' into simplify-asyncbb8-errors

oxidecomputer · Oct 6, 2023 · f1c045d · f1c045d
2 parents 3d3d6da + bb4e0cc
commit f1c045d
Show file tree

Hide file tree

Showing 83 changed files with 1,488 additions and 303 deletions.
diff --git a/.config/hakari.toml b/.config/hakari.toml
@@ -6,6 +6,10 @@ hakari-package = "omicron-workspace-hack"
 # Format for `workspace-hack = ...` lines in other Cargo.tomls. Requires cargo-hakari 0.9.8 or above.
 dep-format-version = "4"
 
+# Output lines as `omicron-workspace-hack.workspace = true`. Requires
+# cargo-hakari 0.9.28 or above.
+workspace-hack-line-style = "workspace-dotted"
+
 # Setting workspace.resolver = "2" in the root Cargo.toml is HIGHLY recommended.
 # Hakari works much better with the new feature resolver.
 # For more about the new feature resolver, see:
@@ -27,4 +31,3 @@ exact-versions = true
 
 [traversal-excludes]
 workspace-members = ["xtask"]
-