-
Notifications
You must be signed in to change notification settings - Fork 82
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
Ready for Review: Fix font-config crash #168
Ready for Review: Fix font-config crash #168
Conversation
This reverts commit 2ee19a5.
Allowing because following clippy's suggestion results in an error in Rust 1.41.0 (was an unstable feature then)
src/window/concept_frame.rs
Outdated
} | ||
} | ||
let font_bytes: Option<Vec<u8>> = fontconfig::FontConfig::new() | ||
.and_then(|font_config: fontconfig::FontConfig| { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are the type annotations in these and_then
calls necessary? I'd be surprised if they are.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, they aren't. I just included them to aid my understanding through the implementation. Hopefully this next commit will compile, and then it will be ready (but maybe need to squash b/c so many were failing)
I am unable to compile on my own before each commit because my build of calloop keeps failing. |
@chrisduerr It's ready now for your review. It will definitely need to be squashed when it's merged because 17 commits for a couple lines is excessive. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small nit: It looks like you may have accidentally added your .DS_Store
file. I might be good to add this to the .gitignore
for this repository.
Files that are specific to your development process should always be added to your global gitignore file, not project specific gitignores. |
@brightly-salty : if you are unable to compile
However, the build failure of |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for your PR!
This looks pretty good overall, There is just one main thing I left in a review comment about self.font_data
that I think should be part of the PR as well. Once that is addressed this should be mergeable. 👍
I have reported it here, but when I run your build script I get similar errors, now coming client-toolkit itself. |
Oh, you're on MacOS. Well that's expected that the build fails then, as no attempt was made to have SCTK build on MacOS given Wayland is not really a thing on this platform. |
.gitignore
Outdated
@@ -2,3 +2,4 @@ | |||
/target | |||
**/*.rs.bk | |||
Cargo.lock | |||
.DS_Store |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As @chrisduerr noted, this kind of files should be added to a global gitignore on your computer rather than in each project gitignore.
Okay, this is good now, thank you! |
Thank you for making a PR to address my alacritty issue! 🎉 |
@vberger Do you want to release a patch for this or are there any other things in the pipeline? |
You're right, there nothing else waiting currently. |
Awesome, thanks for the quick response! |
Fixes #167 and alacritty/alacritty#4591.