Merge #1372

1372: Prepare patch release r=foresterre a=foresterre Co-authored-by: Martijn Gribnau <[email protected]>
foresterre · Dec 12, 2022 · d5c0a4e · d5c0a4e
2 parents 07052d2 + db18a65
commit d5c0a4e
Show file tree

Hide file tree

Showing 61 changed files with 24 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,15 @@ The changelog below lists notable changes for [sic](https://github.com/foresterr
 
 ## [Unreleased]
 
-[unreleased]: https://github.com/foresterre/sic/compare/v0.20.0...HEAD
+[unreleased]: https://github.com/foresterre/sic/compare/v0.20.1...HEAD
+
+## [0.20.1] - 2022-12-12
+
+### Changed
+
+- Updated dependencies
+
+[0.20.1]: https://github.com/foresterre/sic/compare/v0.20.0...v0.20.1
 
 ## [0.20.0] - 2022-03-30
 

diff --git a/Cargo.toml b/Cargo.toml
@@ -24,21 +24,21 @@ tag-prefix = ""
 
 [workspace]
 members = [
-    "components/sic_cli_ops",
-    "components/sic_core",
-    "components/sic_image_engine",
-    "components/sic_io",
-    "components/sic_parser",
-    "components/sic_testing",
+    "crates/sic_cli_ops",
+    "crates/sic_core",
+    "crates/sic_image_engine",
+    "crates/sic_io",
+    "crates/sic_parser",
+    "crates/sic_testing",
     "tools/pack-release",
 ]
 
 [dependencies]
-sic_cli_ops = { version = "0.20.0", path = "components/sic_cli_ops" }
-sic_core = { version = "0.20.0", path = "components/sic_core" }
-sic_io  = { version = "0.20.0", path = "components/sic_io" }
-sic_image_engine = { version = "0.20.0", path = "components/sic_image_engine" }
-sic_parser = { version = "0.20.0", path = "components/sic_parser"}
+sic_cli_ops = { version = "0.20.0", path = "crates/sic_cli_ops" }
+sic_core = { version = "0.20.0", path = "crates/sic_core" }
+sic_io  = { version = "0.20.0", path = "crates/sic_io" }
+sic_image_engine = { version = "0.20.0", path = "crates/sic_image_engine" }
+sic_parser = { version = "0.20.0", path = "crates/sic_parser" }
 
 anyhow = "1.0.66"
 atty = "0.2.14"
@@ -62,4 +62,3 @@ output-test-images = []
 panic = "abort"
 lto = true
 codegen-units = 1
-
diff --git a/components/sic_cli_ops/Cargo.toml → crates/sic_cli_ops/Cargo.toml b/components/sic_cli_ops/Cargo.toml → crates/sic_cli_ops/Cargo.toml
@@ -12,17 +12,17 @@ rust-version = "1.56"
 
 
 [dependencies]
-sic_image_engine = { version = "0.20.0", path = "../../components/sic_image_engine" }
-sic_parser = { version = "0.20.0", path = "../../components/sic_parser" }
+sic_image_engine = { version = "0.20.0", path = "../sic_image_engine" }
+sic_parser = { version = "0.20.0", path = "../sic_parser" }
 
 clap = "2.34.0"
 strum = "0.24.1"
 strum_macros = "0.24.3"
 thiserror = "1.0.37"
 
 [dev-dependencies]
-sic_core = { version = "0.20.0", path = "../../components/sic_core" }
-sic_testing = { version = "0.20.0", path = "../../components/sic_testing" }
+sic_core = { version = "0.20.0", path = "../sic_core" }
+sic_testing = { version = "0.20.0", path = "../sic_testing" }
 parameterized = "1.0.0"
 
 [features]

diff --git a/components/sic_cli_ops/src/errors.rs → crates/sic_cli_ops/src/errors.rs b/components/sic_cli_ops/src/errors.rs → crates/sic_cli_ops/src/errors.rs
diff --git a/components/sic_cli_ops/src/lib.rs → crates/sic_cli_ops/src/lib.rs b/components/sic_cli_ops/src/lib.rs → crates/sic_cli_ops/src/lib.rs
diff --git a/components/sic_cli_ops/src/operations.rs → crates/sic_cli_ops/src/operations.rs b/components/sic_cli_ops/src/operations.rs → crates/sic_cli_ops/src/operations.rs
diff --git a/components/sic_core/Cargo.toml → crates/sic_core/Cargo.toml b/components/sic_core/Cargo.toml → crates/sic_core/Cargo.toml
diff --git a/components/sic_core/src/errors.rs → crates/sic_core/src/errors.rs b/components/sic_core/src/errors.rs → crates/sic_core/src/errors.rs
diff --git a/components/sic_core/src/lib.rs → crates/sic_core/src/lib.rs b/components/sic_core/src/lib.rs → crates/sic_core/src/lib.rs
diff --git a/components/sic_image_engine/Cargo.toml → crates/sic_image_engine/Cargo.toml b/components/sic_image_engine/Cargo.toml → crates/sic_image_engine/Cargo.toml
diff --git a/components/sic_image_engine/src/engine.rs → crates/sic_image_engine/src/engine.rs b/components/sic_image_engine/src/engine.rs → crates/sic_image_engine/src/engine.rs
diff --git a/components/sic_image_engine/src/errors.rs → crates/sic_image_engine/src/errors.rs b/components/sic_image_engine/src/errors.rs → crates/sic_image_engine/src/errors.rs
diff --git a/...onents/sic_image_engine/src/helper/mod.rs → crates/sic_image_engine/src/helper/mod.rs b/...onents/sic_image_engine/src/helper/mod.rs → crates/sic_image_engine/src/helper/mod.rs
diff --git a/...nts/sic_image_engine/src/helper/resize.rs → crates/sic_image_engine/src/helper/resize.rs b/...nts/sic_image_engine/src/helper/resize.rs → crates/sic_image_engine/src/helper/resize.rs
diff --git a/components/sic_image_engine/src/lib.rs → crates/sic_image_engine/src/lib.rs b/components/sic_image_engine/src/lib.rs → crates/sic_image_engine/src/lib.rs
diff --git a/...s/sic_image_engine/src/operations/blur.rs → ...s/sic_image_engine/src/operations/blur.rs b/...s/sic_image_engine/src/operations/blur.rs → ...s/sic_image_engine/src/operations/blur.rs
diff --git a/...c_image_engine/src/operations/brighten.rs → ...c_image_engine/src/operations/brighten.rs b/...c_image_engine/src/operations/brighten.rs → ...c_image_engine/src/operations/brighten.rs
diff --git a/...c_image_engine/src/operations/contrast.rs → ...c_image_engine/src/operations/contrast.rs b/...c_image_engine/src/operations/contrast.rs → ...c_image_engine/src/operations/contrast.rs
diff --git a/...s/sic_image_engine/src/operations/crop.rs → ...s/sic_image_engine/src/operations/crop.rs b/...s/sic_image_engine/src/operations/crop.rs → ...s/sic_image_engine/src/operations/crop.rs
diff --git a/...s/sic_image_engine/src/operations/diff.rs → ...s/sic_image_engine/src/operations/diff.rs b/...s/sic_image_engine/src/operations/diff.rs → ...s/sic_image_engine/src/operations/diff.rs
diff --git a/..._image_engine/src/operations/draw_text.rs → ..._image_engine/src/operations/draw_text.rs b/..._image_engine/src/operations/draw_text.rs → ..._image_engine/src/operations/draw_text.rs
diff --git a/..._image_engine/src/operations/filter3x3.rs → ..._image_engine/src/operations/filter3x3.rs b/..._image_engine/src/operations/filter3x3.rs → ..._image_engine/src/operations/filter3x3.rs
diff --git a/..._engine/src/operations/flip_horizontal.rs → ..._engine/src/operations/flip_horizontal.rs b/..._engine/src/operations/flip_horizontal.rs → ..._engine/src/operations/flip_horizontal.rs
diff --git a/...ge_engine/src/operations/flip_vertical.rs → ...ge_engine/src/operations/flip_vertical.rs b/...ge_engine/src/operations/flip_vertical.rs → ...ge_engine/src/operations/flip_vertical.rs
diff --git a/..._image_engine/src/operations/grayscale.rs → ..._image_engine/src/operations/grayscale.rs b/..._image_engine/src/operations/grayscale.rs → ..._image_engine/src/operations/grayscale.rs
diff --git a/...ine/src/operations/horizontal_gradient.rs → ...ine/src/operations/horizontal_gradient.rs b/...ine/src/operations/horizontal_gradient.rs → ...ine/src/operations/horizontal_gradient.rs
diff --git a/...image_engine/src/operations/hue_rotate.rs → ...image_engine/src/operations/hue_rotate.rs b/...image_engine/src/operations/hue_rotate.rs → ...image_engine/src/operations/hue_rotate.rs
diff --git a/...sic_image_engine/src/operations/invert.rs → ...sic_image_engine/src/operations/invert.rs b/...sic_image_engine/src/operations/invert.rs → ...sic_image_engine/src/operations/invert.rs
diff --git a/...ts/sic_image_engine/src/operations/mod.rs → ...es/sic_image_engine/src/operations/mod.rs b/...ts/sic_image_engine/src/operations/mod.rs → ...es/sic_image_engine/src/operations/mod.rs
diff --git a/...ic_image_engine/src/operations/overlay.rs → ...ic_image_engine/src/operations/overlay.rs b/...ic_image_engine/src/operations/overlay.rs → ...ic_image_engine/src/operations/overlay.rs
diff --git a/...sic_image_engine/src/operations/resize.rs → ...sic_image_engine/src/operations/resize.rs b/...sic_image_engine/src/operations/resize.rs → ...sic_image_engine/src/operations/resize.rs
diff --git a/..._image_engine/src/operations/rotate180.rs → ..._image_engine/src/operations/rotate180.rs b/..._image_engine/src/operations/rotate180.rs → ..._image_engine/src/operations/rotate180.rs
diff --git a/..._image_engine/src/operations/rotate270.rs → ..._image_engine/src/operations/rotate270.rs b/..._image_engine/src/operations/rotate270.rs → ..._image_engine/src/operations/rotate270.rs
diff --git a/...c_image_engine/src/operations/rotate90.rs → ...c_image_engine/src/operations/rotate90.rs b/...c_image_engine/src/operations/rotate90.rs → ...c_image_engine/src/operations/rotate90.rs
diff --git a/..._image_engine/src/operations/threshold.rs → ..._image_engine/src/operations/threshold.rs b/..._image_engine/src/operations/threshold.rs → ..._image_engine/src/operations/threshold.rs
diff --git a/..._image_engine/src/operations/unsharpen.rs → ..._image_engine/src/operations/unsharpen.rs b/..._image_engine/src/operations/unsharpen.rs → ..._image_engine/src/operations/unsharpen.rs
diff --git a/...ngine/src/operations/vertical_gradient.rs → ...ngine/src/operations/vertical_gradient.rs b/...ngine/src/operations/vertical_gradient.rs → ...ngine/src/operations/vertical_gradient.rs
diff --git a/...age_engine/src/wrapper/draw_text_inner.rs → ...age_engine/src/wrapper/draw_text_inner.rs b/...age_engine/src/wrapper/draw_text_inner.rs → ...age_engine/src/wrapper/draw_text_inner.rs
diff --git a/...c_image_engine/src/wrapper/filter_type.rs → ...c_image_engine/src/wrapper/filter_type.rs b/...c_image_engine/src/wrapper/filter_type.rs → ...c_image_engine/src/wrapper/filter_type.rs
diff --git a/..._image_engine/src/wrapper/font_options.rs → ..._image_engine/src/wrapper/font_options.rs b/..._image_engine/src/wrapper/font_options.rs → ..._image_engine/src/wrapper/font_options.rs
diff --git a/...c_image_engine/src/wrapper/gradient_fn.rs → ...c_image_engine/src/wrapper/gradient_fn.rs b/...c_image_engine/src/wrapper/gradient_fn.rs → ...c_image_engine/src/wrapper/gradient_fn.rs
diff --git a/...mage_engine/src/wrapper/gradient_input.rs → ...mage_engine/src/wrapper/gradient_input.rs b/...mage_engine/src/wrapper/gradient_input.rs → ...mage_engine/src/wrapper/gradient_input.rs
diff --git a/...ic_image_engine/src/wrapper/image_path.rs → ...ic_image_engine/src/wrapper/image_path.rs b/...ic_image_engine/src/wrapper/image_path.rs → ...ic_image_engine/src/wrapper/image_path.rs
diff --git a/...nents/sic_image_engine/src/wrapper/mod.rs → crates/sic_image_engine/src/wrapper/mod.rs b/...nents/sic_image_engine/src/wrapper/mod.rs → crates/sic_image_engine/src/wrapper/mod.rs
diff --git a/...s/sic_image_engine/src/wrapper/overlay.rs → ...s/sic_image_engine/src/wrapper/overlay.rs b/...s/sic_image_engine/src/wrapper/overlay.rs → ...s/sic_image_engine/src/wrapper/overlay.rs
diff --git a/components/sic_io/Cargo.toml → crates/sic_io/Cargo.toml b/components/sic_io/Cargo.toml → crates/sic_io/Cargo.toml
diff --git a/components/sic_io/src/conversion.rs → crates/sic_io/src/conversion.rs b/components/sic_io/src/conversion.rs → crates/sic_io/src/conversion.rs
diff --git a/components/sic_io/src/errors.rs → crates/sic_io/src/errors.rs b/components/sic_io/src/errors.rs → crates/sic_io/src/errors.rs
diff --git a/components/sic_io/src/export.rs → crates/sic_io/src/export.rs b/components/sic_io/src/export.rs → crates/sic_io/src/export.rs
diff --git a/components/sic_io/src/format.rs → crates/sic_io/src/format.rs b/components/sic_io/src/format.rs → crates/sic_io/src/format.rs
diff --git a/components/sic_io/src/import.rs → crates/sic_io/src/import.rs b/components/sic_io/src/import.rs → crates/sic_io/src/import.rs
diff --git a/components/sic_io/src/lib.rs → crates/sic_io/src/lib.rs b/components/sic_io/src/lib.rs → crates/sic_io/src/lib.rs
diff --git a/components/sic_parser/Cargo.toml → crates/sic_parser/Cargo.toml b/components/sic_parser/Cargo.toml → crates/sic_parser/Cargo.toml
diff --git a/components/sic_parser/src/errors.rs → crates/sic_parser/src/errors.rs b/components/sic_parser/src/errors.rs → crates/sic_parser/src/errors.rs
diff --git a/components/sic_parser/src/grammar.pest → crates/sic_parser/src/grammar.pest b/components/sic_parser/src/grammar.pest → crates/sic_parser/src/grammar.pest
diff --git a/components/sic_parser/src/lib.rs → crates/sic_parser/src/lib.rs b/components/sic_parser/src/lib.rs → crates/sic_parser/src/lib.rs
diff --git a/components/sic_parser/src/named_value.rs → crates/sic_parser/src/named_value.rs b/components/sic_parser/src/named_value.rs → crates/sic_parser/src/named_value.rs
diff --git a/components/sic_parser/src/rule_parser.rs → crates/sic_parser/src/rule_parser.rs b/components/sic_parser/src/rule_parser.rs → crates/sic_parser/src/rule_parser.rs
diff --git a/components/sic_parser/src/value_parser.rs → crates/sic_parser/src/value_parser.rs b/components/sic_parser/src/value_parser.rs → crates/sic_parser/src/value_parser.rs
diff --git a/components/sic_testing/Cargo.toml → crates/sic_testing/Cargo.toml b/components/sic_testing/Cargo.toml → crates/sic_testing/Cargo.toml
diff --git a/components/sic_testing/src/lib.rs → crates/sic_testing/src/lib.rs b/components/sic_testing/src/lib.rs → crates/sic_testing/src/lib.rs