Skip to content

Commit

Permalink
bump version to v1.1.1 + run clippy and fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
HJfod committed Oct 23, 2022
1 parent 8d73d04 commit 902db0e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "geode"
version = "1.1.0"
version = "1.1.1"
authors = ["HJfod <[email protected]>", "Camila314 <[email protected]>"]
edition = "2021"
build = "build.rs"
Expand Down
5 changes: 3 additions & 2 deletions src/sdk.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ fn update_submodules_recurse(repo: &Repository) -> Result<(), git2::Error> {
.name()
.as_ref()
.map(|s| String::from(*s))
.unwrap_or("<Unknown>".into());
.unwrap_or_else(|| "<Unknown>".into());

let mut callbacks = RemoteCallbacks::new();
callbacks.sideband_progress(|x| {
Expand Down Expand Up @@ -177,9 +177,10 @@ fn install(config: &mut Config, path: PathBuf) {
cfg_if::cfg_if!(
if #[cfg(windows)] {
let hklm = RegKey::predef(winreg::enums::HKEY_CURRENT_USER);
if let Err(_) = hklm
if hklm
.create_subkey("Environment")
.map(|(env, _)| env.set_value("GEODE_SDK", &path.to_str().unwrap().to_string()))
.is_err()
{
warn!(
"Unable to set the GEODE_SDK enviroment variable to {}, \
Expand Down
6 changes: 1 addition & 5 deletions src/util/bmfont.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,7 @@ fn initialize_font_bundle(
.filter_map(|c| {
let (metrics, data) = ttf_font.rasterize(*c, scaled_size as f32);

if let Some(mut img) = generate_char(font, metrics, data) {
Some(RenderedChar { id: *c, img })
} else {
None
}
generate_char(font, metrics, data).map(|img| RenderedChar { id: *c, img })
})
.collect();

Expand Down
2 changes: 1 addition & 1 deletion src/util/logging.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ macro_rules! done {
#[macro_export]
macro_rules! confirm {
($x:expr $(, $more:expr)*) => {
crate::logging::ask_confirm(&format!($x, $($more),*), false)
$crate::logging::ask_confirm(&format!($x, $($more),*), false)
};
}

Expand Down

0 comments on commit 902db0e

Please sign in to comment.