From 34e137a346752b21b4f03bfead7926a5abd904c9 Mon Sep 17 00:00:00 2001
From: Kedar Sovani <kedars@gmail.com>
Date: Thu, 12 Jan 2023 18:32:53 +0530
Subject: [PATCH] Rebase changes on latest commit

---
 examples/onoff_light/src/main.rs                   | 2 +-
 matter/src/core.rs                                 | 4 ++--
 matter/src/data_model/cluster_basic_information.rs | 2 +-
 matter/src/data_model/core.rs                      | 2 +-
 matter/src/data_model/device_types.rs              | 2 +-
 matter/src/lib.rs                                  | 2 +-
 matter/tests/common/im_engine.rs                   | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/examples/onoff_light/src/main.rs b/examples/onoff_light/src/main.rs
index 9350451..bbf1d8b 100644
--- a/examples/onoff_light/src/main.rs
+++ b/examples/onoff_light/src/main.rs
@@ -39,7 +39,7 @@ fn main() {
     };
     let dev_att = Box::new(dev_att::HardCodedDevAtt::new());
 
-    let mut matter = core::Matter::new(&dev_info, dev_att, &comm_data).unwrap();
+    let mut matter = core::Matter::new(dev_info, dev_att, comm_data).unwrap();
     let dm = matter.get_data_model();
     {
         let mut node = dm.node.write().unwrap();
diff --git a/matter/src/core.rs b/matter/src/core.rs
index 7d779a4..39a903f 100644
--- a/matter/src/core.rs
+++ b/matter/src/core.rs
@@ -53,9 +53,9 @@ impl Matter {
     /// requires a set of device attestation certificates and keys. It is the responsibility of
     /// this object to return the device attestation details when queried upon.
     pub fn new(
-        dev_det: &BasicInfoConfig,
+        dev_det: BasicInfoConfig,
         dev_att: Box<dyn DevAttDataFetcher>,
-        dev_comm: &CommissioningData,
+        dev_comm: CommissioningData,
     ) -> Result<Box<Matter>, Error> {
         let mdns = Mdns::get()?;
         mdns.set_values(dev_det.vid, dev_det.pid);
diff --git a/matter/src/data_model/cluster_basic_information.rs b/matter/src/data_model/cluster_basic_information.rs
index d09e4dc..f78c93c 100644
--- a/matter/src/data_model/cluster_basic_information.rs
+++ b/matter/src/data_model/cluster_basic_information.rs
@@ -97,7 +97,7 @@ pub struct BasicInfoCluster {
 }
 
 impl BasicInfoCluster {
-    pub fn new(cfg: &BasicInfoConfig) -> Result<Box<Self>, Error> {
+    pub fn new(cfg: BasicInfoConfig) -> Result<Box<Self>, Error> {
         let mut cluster = Box::new(BasicInfoCluster {
             base: Cluster::new(ID)?,
         });
diff --git a/matter/src/data_model/core.rs b/matter/src/data_model/core.rs
index e6fcf7c..8cddaf4 100644
--- a/matter/src/data_model/core.rs
+++ b/matter/src/data_model/core.rs
@@ -51,7 +51,7 @@ pub struct DataModel {
 
 impl DataModel {
     pub fn new(
-        dev_details: &BasicInfoConfig,
+        dev_details: BasicInfoConfig,
         dev_att: Box<dyn DevAttDataFetcher>,
         fabric_mgr: Arc<FabricMgr>,
         acl_mgr: Arc<AclMgr>,
diff --git a/matter/src/data_model/device_types.rs b/matter/src/data_model/device_types.rs
index b621ce1..12874f4 100644
--- a/matter/src/data_model/device_types.rs
+++ b/matter/src/data_model/device_types.rs
@@ -41,7 +41,7 @@ type WriteNode<'a> = RwLockWriteGuard<'a, Box<Node>>;
 
 pub fn device_type_add_root_node(
     node: &mut WriteNode,
-    dev_info: &BasicInfoConfig,
+    dev_info: BasicInfoConfig,
     dev_att: Box<dyn DevAttDataFetcher>,
     fabric_mgr: Arc<FabricMgr>,
     acl_mgr: Arc<AclMgr>,
diff --git a/matter/src/lib.rs b/matter/src/lib.rs
index a0a9603..cb4b1e2 100644
--- a/matter/src/lib.rs
+++ b/matter/src/lib.rs
@@ -55,7 +55,7 @@
 //!
 //! /// Get the Matter Object
 //! /// The dev_att is an object that implements the DevAttDataFetcher trait.
-//! let mut matter = Matter::new(&dev_info, dev_att, &comm_data).unwrap();
+//! let mut matter = Matter::new(dev_info, dev_att, comm_data).unwrap();
 //! let dm = matter.get_data_model();
 //! {
 //!     let mut node = dm.node.write().unwrap();
diff --git a/matter/tests/common/im_engine.rs b/matter/tests/common/im_engine.rs
index 45f8fe5..b0a1d64 100644
--- a/matter/tests/common/im_engine.rs
+++ b/matter/tests/common/im_engine.rs
@@ -106,7 +106,7 @@ impl ImEngine {
         default_acl.add_subject(IM_ENGINE_PEER_ID).unwrap();
         acl_mgr.add(default_acl).unwrap();
         let dm = DataModel::new(
-            &dev_det,
+            dev_det,
             dev_att,
             fabric_mgr.clone(),
             acl_mgr.clone(),