Fix compilation issue after #118 (#128)

* Fix compilation issue after #118 Signed-off-by: Pierre Fenoll <[email protected]> * Fix compilation of hlua by switching to a temporary fork Signed-off-by: Pierre Fenoll <[email protected]> --------- Signed-off-by: Pierre Fenoll <[email protected]>
canselcik · Jul 27, 2024 · 6711432 · 6711432
1 parent 9191261
commit 6711432
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -36,7 +36,7 @@ fxhash = { version = "0.2.1", optional = true }
 aabb-quadtree = { version = "0.1.0", optional = true }
 
 # hlua
-hlua = { version = "0.4.1", optional = true }
+hlua = { git = "https://github.com/fenollp/hlua.git", rev = "f327e79", optional = true } # hlua = { version = "0.4.1", optional = true } TODO: https://github.com/tomaka/hlua/pull/223
 
 # runtime benchmarking
 stopwatch = { version = "0.0.7", optional = true }

diff --git a/src/framebuffer/core.rs b/src/framebuffer/core.rs
@@ -52,8 +52,8 @@ impl Framebuffer {
             Model::Gen1 => Framebuffer::device(device.get_framebuffer_path()),
             Model::Gen2 => {
                 // Auto-select old method still if env LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB is set affirmatively
-                match std::env::var("LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB").ok() {
-                    Some("1") => Framebuffer::device(device.get_framebuffer_path()),
+                match std::env::var("LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB").as_deref() {
+                    Ok("1") => Framebuffer::device(device.get_framebuffer_path()),
                     _ => Framebuffer::rm2fb(device.get_framebuffer_path()),
                 }
             }