Skip to content

Commit eea378a

Browse files
authored
use rust stable channel instead of nightly (#62)
1 parent d91bf6a commit eea378a

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

radiance/radiance/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ imgui = { version = "0.10", features = ["docking"] }
2020
lazy_static = "1.2.0"
2121
lewton = "0.10.1"
2222
log = "0.4.13"
23-
lru = { version = "0.7.1", features=["nightly"] }
23+
lru = { version = "0.12.5" }
2424
memoffset = "0.9.0"
2525
mini-fs = { git = "https://github.com/dontpanic92/mini-fs/" }
2626
radiance-assets = { path = "../radiance-assets" }

radiance/radiance/src/rendering/texture.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::sync::{Arc, RwLock};
2+
use std::num::NonZero;
23

34
use image::RgbaImage;
45
use lru::LruCache;
@@ -26,7 +27,7 @@ impl TextureDef {
2627
}
2728

2829
lazy_static::lazy_static! {
29-
static ref TEXTURE_STORE: RwLock<LruCache<String, Arc<TextureDef>>> = RwLock::new(LruCache::new(100));
30+
static ref TEXTURE_STORE: RwLock<LruCache<String, Arc<TextureDef>>> = RwLock::new(LruCache::new(NonZero::new(100).unwrap()));
3031
}
3132

3233
pub struct TextureStore;

radiance/radiance/src/rendering/vulkan/texture.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use ash::vk;
77
use lru::LruCache;
88
use std::error::Error;
99
use std::rc::Rc;
10+
use std::num::NonZero;
1011

1112
pub struct VulkanTexture {
1213
image: Image,
@@ -102,7 +103,7 @@ pub struct VulkanTextureStore {
102103
impl VulkanTextureStore {
103104
pub fn new() -> Self {
104105
Self {
105-
store: LruCache::new(10000),
106+
store: LruCache::new(NonZero::new(10000).unwrap()),
106107
}
107108
}
108109

yaobow/packfs/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(io_error_more)]
21
#![cfg_attr(target_os = "vita", feature(stdarch_arm_neon_intrinsics))]
32

43
pub mod cpk;

yaobow/shared/src/lib.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(trait_upcasting)]
2-
31
use loaders::{dff::DffLoaderConfig, Pal4TextureResolver};
42

53
use crate::loaders::{Pal5TextureResolver, Swd5TextureResolver};

yaobow/yaobow_editor/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ image = "0.23.0"
1818
imgui = { version="0.10", features = ["docking", "tables-api"] }
1919
lazy_static = "1.2.0"
2020
log = { version = "0.4", features = ["max_level_debug", "release_max_level_debug"] }
21-
lru = { version = "0.7.1", features=["nightly"] }
21+
lru = { version = "0.12.5" }
2222
mini-fs = { git = "https://github.com/dontpanic92/mini-fs/" }
2323
native-dialog = "0.6.3"
2424
radiance = { path = "../../radiance/radiance" }

yaobow/yaobow_editor/src/directors/main_director.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use std::{
1717
cmp::Ordering,
1818
path::{Path, PathBuf},
1919
rc::Rc,
20+
num::NonZero,
2021
};
2122

2223
pub struct DevToolsDirector {
@@ -46,7 +47,7 @@ impl DevToolsDirector {
4647
)),
4748
ui,
4849
asset_mgr,
49-
cache: RefCell::new(lru::LruCache::new(20)),
50+
cache: RefCell::new(lru::LruCache::new(NonZero::new(20).unwrap())),
5051
})
5152
}
5253

@@ -133,7 +134,6 @@ impl DevToolsDirector {
133134

134135
entries
135136
})
136-
.unwrap()
137137
.clone()
138138
}
139139
}

0 commit comments

Comments
 (0)