Skip to content

Commit 902db0e

Browse files
committed
bump version to v1.1.1 + run clippy and fmt
1 parent 8d73d04 commit 902db0e

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "geode"
3-
version = "1.1.0"
3+
version = "1.1.1"
44
authors = ["HJfod <[email protected]>", "Camila314 <[email protected]>"]
55
edition = "2021"
66
build = "build.rs"

src/sdk.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn update_submodules_recurse(repo: &Repository) -> Result<(), git2::Error> {
111111
.name()
112112
.as_ref()
113113
.map(|s| String::from(*s))
114-
.unwrap_or("<Unknown>".into());
114+
.unwrap_or_else(|| "<Unknown>".into());
115115

116116
let mut callbacks = RemoteCallbacks::new();
117117
callbacks.sideband_progress(|x| {
@@ -177,9 +177,10 @@ fn install(config: &mut Config, path: PathBuf) {
177177
cfg_if::cfg_if!(
178178
if #[cfg(windows)] {
179179
let hklm = RegKey::predef(winreg::enums::HKEY_CURRENT_USER);
180-
if let Err(_) = hklm
180+
if hklm
181181
.create_subkey("Environment")
182182
.map(|(env, _)| env.set_value("GEODE_SDK", &path.to_str().unwrap().to_string()))
183+
.is_err()
183184
{
184185
warn!(
185186
"Unable to set the GEODE_SDK enviroment variable to {}, \

src/util/bmfont.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -151,11 +151,7 @@ fn initialize_font_bundle(
151151
.filter_map(|c| {
152152
let (metrics, data) = ttf_font.rasterize(*c, scaled_size as f32);
153153

154-
if let Some(mut img) = generate_char(font, metrics, data) {
155-
Some(RenderedChar { id: *c, img })
156-
} else {
157-
None
158-
}
154+
generate_char(font, metrics, data).map(|img| RenderedChar { id: *c, img })
159155
})
160156
.collect();
161157

src/util/logging.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ macro_rules! done {
4444
#[macro_export]
4545
macro_rules! confirm {
4646
($x:expr $(, $more:expr)*) => {
47-
crate::logging::ask_confirm(&format!($x, $($more),*), false)
47+
$crate::logging::ask_confirm(&format!($x, $($more),*), false)
4848
};
4949
}
5050

0 commit comments

Comments
 (0)