Update CGP version to v0.2 (#14)

Author: soareschen

Cargo.lock

@@ -8,4 +8,4 @@ itertools = "0.11.0"
 serde = {version = "1", features = ["derive"] }
 serde_json = "1"
 anyhow = "1"
-cgp = { version = "0.1.0" }
+cgp = { version = "0.2.0" }

Cargo.toml

@@ -6,6 +6,9 @@
 
 This repository contains the source code for the book _Context-Generic Programming Patterns_. The published version of this book is available at https://patterns.contextgeneric.dev/.
 
+For more information about context-generic programming, check out the
+main website at https://www.contextgeneric.dev/.
+
 ## Build Instructions
 
 This book is built using [mdBook](https://rust-lang.github.io/mdBook/). Follow the [installation instructions](https://rust-lang.github.io/mdBook/guide/installation.html) to install mdBook on your machine. You can then serve a local version of the book by running:

README.md

@@ -189,12 +189,20 @@ use serde::{Serialize, Deserialize};
 
 // Component definitions
 
-#[derive_component(StringFormatterComponent, StringFormatter<Context>)]
+#[cgp_component {
+    name: StringFormatterComponent,
+    provider: StringFormatter,
+    context: Context,
+}]
 pub trait CanFormatToString {
     fn format_to_string(&self) -> Result<String, Error>;
 }
 
-#[derive_component(StringParserComponent, StringParser<Context>)]
+#[cgp_component {
+    name: StringParserComponent,
+    provider: StringParser,
+    context: Context,
+}]
 pub trait CanParseFromString: Sized {
     fn parse_from_string(raw: &str) -> Result<Self, Error>;
 }

content/component-macros.md

@@ -35,12 +35,20 @@ Consider if we made a mistake and forgot to implement `Serialize` for `Person`:
 # use anyhow::Error;
 # use serde::{Serialize, Deserialize};
 #
-# #[derive_component(StringFormatterComponent, StringFormatter<Context>)]
+# #[cgp_component {
+#    name: StringFormatterComponent,
+#    provider: StringFormatter,
+#    context: Context,
+# }]
 # pub trait CanFormatToString {
 #     fn format_to_string(&self) -> Result<String, Error>;
 # }
 #
-# #[derive_component(StringParserComponent, StringParser<Context>)]
+# #[cgp_component {
+#    name: StringParserComponent,
+#    provider: StringParser,
+#    context: Context,
+# }]
 # pub trait CanParseFromString: Sized {
 #     fn parse_from_string(raw: &str) -> Result<Self, Error>;
 # }
@@ -108,12 +116,20 @@ call `format_to_string`, and check if it works:
 # use anyhow::Error;
 # use serde::{Serialize, Deserialize};
 #
-# #[derive_component(StringFormatterComponent, StringFormatter<Context>)]
+# #[cgp_component {
+#    name: StringFormatterComponent,
+#    provider: StringFormatter,
+#    context: Context,
+# }]
 # pub trait CanFormatToString {
 #     fn format_to_string(&self) -> Result<String, Error>;
 # }
 #
-# #[derive_component(StringParserComponent, StringParser<Context>)]
+# #[cgp_component {
+#    name: StringParserComponent,
+#    provider: StringParser,
+#    context: Context,
+# }]
 # pub trait CanParseFromString: Sized {
 #     fn parse_from_string(raw: &str) -> Result<Self, Error>;
 # }
@@ -246,12 +262,20 @@ defined as follows:
 # use anyhow::Error;
 # use serde::{Serialize, Deserialize};
 #
-# #[derive_component(StringFormatterComponent, StringFormatter<Context>)]
+# #[cgp_component {
+#    name: StringFormatterComponent,
+#    provider: StringFormatter,
+#    context: Context,
+# }]
 # pub trait CanFormatToString {
 #     fn format_to_string(&self) -> Result<String, Error>;
 # }
 #
-# #[derive_component(StringParserComponent, StringParser<Context>)]
+# #[cgp_component {
+#    name: StringParserComponent,
+#    provider: StringParser,
+#    context: Context,
+# }]
 # pub trait CanParseFromString: Sized {
 #     fn parse_from_string(raw: &str) -> Result<Self, Error>;
 # }
@@ -372,12 +396,20 @@ the super trait of `CanUsePerson` as follows:
 # use anyhow::Error;
 # use serde::{Serialize, Deserialize};
 #
-# #[derive_component(StringFormatterComponent, StringFormatter<Context>)]
+# #[cgp_component {
+#    name: StringFormatterComponent,
+#    provider: StringFormatter,
+#    context: Context,
+# }]
 # pub trait CanFormatToString {
 #     fn format_to_string(&self) -> Result<String, Error>;
 # }
 #
-# #[derive_component(StringParserComponent, StringParser<Context>)]
+# #[cgp_component {
+#    name: StringParserComponent,
+#    provider: StringParser,
+#    context: Context,
+# }]
 # pub trait CanParseFromString: Sized {
 #     fn parse_from_string(raw: &str) -> Result<Self, Error>;
 # }