Fix error wrapping chapter

Author: soareschen

content/error-wrapping.md

@@ -350,13 +350,6 @@ To see how `CanWrapError` works in practice, we can redefine `LoadJsonConfig` to
 #     fn config_path(&self) -> &PathBuf;
 # }
 #
-# #[cgp_component {
-#     provider: ErrorWrapper,
-# }]
-# pub trait CanWrapError<Detail>: HasErrorType {
-#     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-# }
-#
 pub struct LoadJsonConfig;
 
 impl<Context> ConfigLoader<Context> for LoadJsonConfig
@@ -430,13 +423,7 @@ So we can implement an error wrapper provider for `anyhow::Error` as follows:
 # use core::fmt::Display;
 #
 # use cgp::prelude::*;
-#
-# #[cgp_component {
-#     provider: ErrorWrapper,
-# }]
-# pub trait CanWrapError<Detail>: HasErrorType {
-#     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-# }
+# use cgp::core::error::ErrorWrapper;
 #
 pub struct WrapWithAnyhowContext;
 
@@ -524,13 +511,6 @@ type as follows:
 #     fn config_path(&self) -> &PathBuf;
 # }
 #
-# #[cgp_component {
-#     provider: ErrorWrapper,
-# }]
-# pub trait CanWrapError<Detail>: HasErrorType {
-#     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-# }
-#
 pub struct LoadJsonConfig;
 
 pub struct ErrLoadJsonConfig<'a, Context> {
@@ -627,13 +607,7 @@ as follows:
 # use core::fmt::Debug;
 #
 # use cgp::prelude::*;
-#
-# #[cgp_component {
-#     provider: ErrorWrapper,
-# }]
-# pub trait CanWrapError<Detail>: HasErrorType {
-#     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-# }
+# use cgp::core::error::ErrorWrapper;
 #
 pub struct WrapWithAnyhowDebug;
 
@@ -691,21 +665,14 @@ pub mod traits {
     pub trait HasConfigPath {
         fn config_path(&self) -> &PathBuf;
     }
-
-    #[cgp_component {
-        provider: ErrorWrapper,
-    }]
-    pub trait CanWrapError<Detail>: HasErrorType {
-        fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-    }
 }
 
 pub mod impls {
     use core::fmt::{Debug, Display};
     use std::path::PathBuf;
     use std::{fs, io};
 
-    use cgp::core::error::{ErrorRaiser, ProvideErrorType};
+    use cgp::core::error::{ErrorRaiser, ErrorWrapper,ProvideErrorType};
     use cgp::prelude::*;
     use serde::Deserialize;
 
@@ -819,7 +786,7 @@ pub mod contexts {
     use std::path::PathBuf;
 
     use cgp::core::component::UseDelegate;
-    use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
+    use cgp::core::error::{ErrorRaiserComponent, ErrorWrapperComponent, ErrorTypeComponent};
     use cgp::prelude::*;
     use serde::Deserialize;
 
@@ -888,15 +855,12 @@ we can also make use of the `UseDelegate` pattern to implement delegated error w
 ```rust
 # extern crate cgp;
 #
+# use core::marker::PhantomData;
+#
 # use cgp::prelude::*;
-# use cgp::core::component::UseDelegate;
+# use cgp::core::error::ErrorWrapper;
 #
-# #[cgp_component {
-#     provider: ErrorWrapper,
-# }]
-# pub trait CanWrapError<Detail>: HasErrorType {
-#     fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-# }
+# pub struct UseDelegate<Components>(pub PhantomData<Components>);
 #
 impl<Context, Detail, Components> ErrorWrapper<Context, Detail> for UseDelegate<Components>
 where
@@ -925,6 +889,7 @@ to different error wrappers, similar to how we dispatch the error raisers based
 #     use std::path::PathBuf;
 #
 #     use cgp::core::component::UseDelegate;
+#     use cgp::core::error::ErrorWrapper;
 #     use cgp::prelude::*;
 #
 #     #[cgp_component {
@@ -948,32 +913,14 @@ to different error wrappers, similar to how we dispatch the error raisers based
 #     pub trait HasConfigPath {
 #         fn config_path(&self) -> &PathBuf;
 #     }
-#
-#     #[cgp_component {
-#         provider: ErrorWrapper,
-#     }]
-#     pub trait CanWrapError<Detail>: HasErrorType {
-#         fn wrap_error(error: Self::Error, detail: Detail) -> Self::Error;
-#     }
-#
-#     impl<Context, Detail, Components> ErrorWrapper<Context, Detail> for UseDelegate<Components>
-#     where
-#         Context: HasErrorType,
-#         Components: DelegateComponent<Detail>,
-#         Components::Delegate: ErrorWrapper<Context, Detail>,
-#     {
-#         fn wrap_error(error: Context::Error, detail: Detail) -> Context::Error {
-#             Components::Delegate::wrap_error(error, detail)
-#         }
-#     }
 # }
 #
 # pub mod impls {
 #     use core::fmt::{Debug, Display};
 #     use std::path::PathBuf;
 #     use std::{fs, io};
 #
-#     use cgp::core::error::{ErrorRaiser, ProvideErrorType};
+#     use cgp::core::error::{ErrorRaiser, ErrorWrapper, ProvideErrorType};
 #     use cgp::prelude::*;
 #     use serde::Deserialize;
 #
@@ -1099,7 +1046,7 @@ to different error wrappers, similar to how we dispatch the error raisers based
 #     use std::path::PathBuf;
 #
 #     use cgp::core::component::UseDelegate;
-#     use cgp::core::error::{ErrorRaiserComponent, ErrorTypeComponent};
+#     use cgp::core::error::{ErrorRaiserComponent, ErrorWrapperComponent, ErrorTypeComponent};
 #     use cgp::prelude::*;
 #     use serde::Deserialize;
 #