Merge pull request #1304 from hannobraun/version

Fix panic on Windows when loading model version
hannobraun · Nov 3, 2022 · eae922b · eae922b
2 parents 5ad5327 + 7681c34
commit eae922b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/crates/fj-host/src/model.rs b/crates/fj-host/src/model.rs
@@ -108,31 +108,27 @@ impl Model {
             let version_pkg: libloading::Symbol<fn() -> RawVersion> =
                 lib.get(b"version_pkg").map_err(Error::LoadingVersion)?;
 
-            let version_pkg = version_pkg();
-            if fj::version::VERSION_PKG != version_pkg.as_str() {
+            let version_pkg = version_pkg().to_string();
+            if fj::version::VERSION_PKG != version_pkg {
                 let host = String::from_utf8_lossy(
                     fj::version::VERSION_PKG.as_bytes(),
                 )
                 .into_owned();
-                let model =
-                    String::from_utf8_lossy(version_pkg.as_str().as_bytes())
-                        .into_owned();
+                let model = version_pkg;
 
                 return Err(Error::VersionMismatch { host, model });
             }
 
             let version_full: libloading::Symbol<fn() -> RawVersion> =
                 lib.get(b"version_full").map_err(Error::LoadingVersion)?;
 
-            let version_full = version_full();
-            if fj::version::VERSION_FULL != version_full.as_str() {
+            let version_full = version_full().to_string();
+            if fj::version::VERSION_FULL != version_full {
                 let host = String::from_utf8_lossy(
                     fj::version::VERSION_FULL.as_bytes(),
                 )
                 .into_owned();
-                let model =
-                    String::from_utf8_lossy(version_full.as_str().as_bytes())
-                        .into_owned();
+                let model = version_full;
 
                 warn!("{}", Error::VersionMismatch { host, model });
             }

diff --git a/crates/fj-window/src/run.rs b/crates/fj-window/src/run.rs
@@ -102,19 +102,7 @@ pub fn run(
                     }
 
                     ModelEvent::Error(err) => {
-                        // Can be cleaned up, once `Report` is stable:
-                        // https://doc.rust-lang.org/std/error/struct.Report.html
-
-                        println!("Error receiving updated shape: {}", err);
-
-                        let mut current_err = &err as &dyn error::Error;
-                        while let Some(err) = current_err.source() {
-                            println!();
-                            println!("Caused by:");
-                            println!("    {}", err);
-
-                            current_err = err;
-                        }
+                        status.update_status(&err.to_string());
                     }
                 }
             }

diff --git a/crates/fj/src/version.rs b/crates/fj/src/version.rs
@@ -39,9 +39,10 @@ impl RawVersion {
     ///
     /// Must be a `RawVersion` returned from one of the hidden version functions
     /// in this module.
-    pub unsafe fn as_str(&self) -> &str {
+    #[allow(clippy::inherent_to_string)]
+    pub unsafe fn to_string(&self) -> String {
         let slice = slice::from_raw_parts(self.ptr, self.len);
-        std::str::from_utf8(slice).unwrap()
+        String::from_utf8_lossy(slice).into_owned()
     }
 }