pyembed: store ImporterState as Arc<T> instead of Arc<Box<T>>

Arc<T> is already on the heap and doesn't need an inner Box<T>.

Author: indygreg

pyembed/src/importer.rs

@@ -473,7 +473,7 @@ impl Drop for ImporterState {
 // methods call into non-macro implemented methods named <method>_impl which
 // are defined below in separate `impl {}` blocks.
 py_class!(class OxidizedFinder |py| {
-    data state: Arc<Box<ImporterState>>;
+    data state: Arc<ImporterState>;
 
     // Start of importlib.abc.MetaPathFinder interface.
 
@@ -914,15 +914,15 @@ impl OxidizedFinder {
 
         let importer = OxidizedFinder::create_instance(
             py,
-            Arc::new(Box::new(ImporterState::new(
+            Arc::new(ImporterState::new(
                 py,
                 &m,
                 &bootstrap_module,
                 resources_state,
                 false,
                 None,
                 None,
-            )?)),
+            )?),
         )?;
 
         Ok(importer)
@@ -1006,15 +1006,15 @@ fn oxidized_finder_new(
 
     let importer = OxidizedFinder::create_instance(
         py,
-        Arc::new(Box::new(ImporterState::new(
+        Arc::new(ImporterState::new(
             py,
             &m,
             &bootstrap_module,
             &resources_state,
             true,
             resources_data,
             mapped,
-        )?)),
+        )?),
     )?;
 
     // We effectively transferred ownership of resources_state just above.
@@ -1091,7 +1091,7 @@ impl OxidizedFinder {
 //
 // Implements importlib.abc.ResourceReader.
 py_class!(class OxidizedResourceReader |py| {
-    data state: Arc<Box<ImporterState>>;
+    data state: Arc<ImporterState>;
     data package: String;
 
     def open_resource(&self, resource: &PyString) -> PyResult<PyObject> {
@@ -1181,7 +1181,7 @@ impl OxidizedResourceReader {
 //
 // This implements importlib.abc.Traversable.
 py_class!(class PyOxidizerTraversable |py| {
-    data state: Arc<Box<ImporterState>>;
+    data state: Arc<ImporterState>;
     data path: String;
 
     // Yield Traversable objects in self.

pyembed/src/package_metadata.rs

@@ -18,7 +18,7 @@ use {
 
 // A importlib.metadata.Distribution allowing access to package distribution data.
 py_class!(class OxidizedDistribution |py| {
-    data state: Arc<Box<ImporterState>>;
+    data state: Arc<ImporterState>;
     data package: String;
 
     def read_text(&self, filename: &PyString) -> PyResult<PyObject> {
@@ -48,7 +48,7 @@ py_class!(class OxidizedDistribution |py| {
 
 impl OxidizedDistribution {
     fn read_text_impl(&self, py: Python, filename: &PyString) -> PyResult<PyObject> {
-        let state: &Arc<Box<ImporterState>> = self.state(py);
+        let state: &Arc<ImporterState> = self.state(py);
         let package: &str = self.package(py);
         let resources_state = state.get_resources_state();
 
@@ -86,7 +86,7 @@ impl OxidizedDistribution {
     /// The returned object will have keys that name the various bits of
     /// metadata.
     fn metadata_impl(&self, py: Python) -> PyResult<PyObject> {
-        let state: &Arc<Box<ImporterState>> = self.state(py);
+        let state: &Arc<ImporterState> = self.state(py);
         let package: &str = self.package(py);
         let resources_state = state.get_resources_state();
 
@@ -178,7 +178,7 @@ impl OxidizedDistribution {
 /// Find package metadata distributions given search criteria.
 pub(crate) fn find_distributions(
     py: Python,
-    state: Arc<Box<ImporterState>>,
+    state: Arc<ImporterState>,
     name: Option<PyObject>,
     _path: Option<PyObject>,
 ) -> PyResult<PyObject> {