Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace winres with winresource #24

Merged
merged 2 commits into from
Oct 30, 2023
Merged

Conversation

steinbro
Copy link
Contributor

Fixes #17

@@ -7,8 +7,6 @@ use windows::Win32::{
UI::WindowsAndMessaging as wm,
};

#[cfg(test)]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After updating my Rust environment by a few versions, I found I could no longer compile non-test builds, due to a missing wide_string module. It works again if I delete this line. My understanding is that this would omit the next line from non-test builds, right? But this annotation isn't new. Why did this used to work?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opps. It is a problem with https://github.com/Eh2406/rust-reader/pull/22/files#diff-42cb6807ad74b3e201c5a7ca98b911c5fa08380e942be6e4ac5807f8377f87fc #[cfg(test)] and #[macro_use] modified the extern crate lazy_static; until we removed it. Now it is incorrectly applying to wide_string.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll push a fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the quick fix. Does the rest of this PR (as well as #23) look good to merge?

@Eh2406 Eh2406 merged commit 9a77bf9 into Eh2406:master Oct 30, 2023
steinbro added a commit to steinbro/rust-reader that referenced this pull request Nov 18, 2023
Fixes bug in PR Eh2406#24, which immediately crashes on launch
steinbro added a commit to steinbro/rust-reader that referenced this pull request Nov 18, 2023
Fixes bug in PR Eh2406#24, which immediately crashes on launch
Eh2406 pushed a commit that referenced this pull request Nov 18, 2023
Fixes bug in PR #24, which immediately crashes on launch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Outdated dependency: winres
2 participants