migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 06:40:06 -04:00
Code Activity

Use log crate instead of eprintln & remove some unwraps (#5010)

Browse Source 
<!--
Please read the "Making a PR" section of
[`CONTRIBUTING.md`](https://github.com/emilk/egui/blob/master/CONTRIBUTING.md)
before opening a Pull Request!

* Keep your PR:s small and focused.
* The PR title is what ends up in the changelog, so make it descriptive!
* If applicable, add a screenshot or gif.
* If it is a non-trivial addition, consider adding a demo for it to
`egui_demo_lib`, or a new example.
* Do NOT open PR:s from your `master` branch, as that makes it hard for
maintainers to test and add commits to your PR.
* Remember to run `cargo fmt` and `cargo clippy`.
* Open the PR as a draft until you have self-reviewed it and run
`./scripts/check.sh`.
* When you have addressed a PR comment, mark it as resolved.

Please be patient! I will review your PR, but my time is limited!
-->

- I fixed the TODO to use the `log` crate instead of `eprintln`
- Set the rust-version in the `scripts/check.sh` to the same as egui is
on
- I made xtask use anyhow to remove some unwraps 

* [x] I have followed the instructions in the PR template
This commit is contained in:
Nicolas
2024-09-13 14:23:13 +02:00
committed by GitHub
parent 66076101e1
commit 1488ffa35a
13 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/eframe/src/native/glow_integration.rs
View File

@@ -1547,7 +1547,7 @@ fn save_screenshot_and_exit(
.unwrap_or_else(|err| {
panic!("Failed to save screenshot to {path:?}: {err}");
});
eprintln!("Screenshot saved to {path:?}.");
log::info!("Screenshot saved to {path:?}.");
#[allow(clippy::exit)]
std::process::exit(0);

2
crates/egui/src/hit_test.rs
View File

@@ -417,7 +417,7 @@ mod tests {
];
for (i, w) in widgets.iter().enumerate() {
eprintln!("Widget {i}: {:?}", w.id);
println!("Widget {i}: {:?}", w.id);
}
// In the middle of the bg-left-label:

4
crates/egui_demo_app/src/main.rs
View File

@@ -64,7 +64,7 @@ fn start_puffin_server() {
match puffin_http::Server::new("127.0.0.1:8585") {
Ok(puffin_server) => {
eprintln!("Run: cargo install puffin_viewer && puffin_viewer --url 127.0.0.1:8585");
log::info!("Run: cargo install puffin_viewer && puffin_viewer --url 127.0.0.1:8585");
std::process::Command::new("puffin_viewer")
.arg("--url")
@@ -78,7 +78,7 @@ fn start_puffin_server() {
std::mem::forget(puffin_server);
}
Err(err) => {
eprintln!("Failed to start puffin server: {err}");
log::error!("Failed to start puffin server: {err}");
}
};
}

12
crates/emath/src/rect.rs
View File

@@ -775,22 +775,22 @@ mod tests {
fn test_ray_intersection() {
let rect = Rect::from_min_max(pos2(1.0, 1.0), pos2(3.0, 3.0));
eprintln!("Righward ray from left:");
println!("Righward ray from left:");
assert!(rect.intersects_ray(pos2(0.0, 2.0), Vec2::RIGHT));
eprintln!("Righward ray from center:");
println!("Righward ray from center:");
assert!(rect.intersects_ray(pos2(2.0, 2.0), Vec2::RIGHT));
eprintln!("Righward ray from right:");
println!("Righward ray from right:");
assert!(!rect.intersects_ray(pos2(4.0, 2.0), Vec2::RIGHT));
eprintln!("Leftward ray from left:");
println!("Leftward ray from left:");
assert!(!rect.intersects_ray(pos2(0.0, 2.0), Vec2::LEFT));
eprintln!("Leftward ray from center:");
println!("Leftward ray from center:");
assert!(rect.intersects_ray(pos2(2.0, 2.0), Vec2::LEFT));
eprintln!("Leftward ray from right:");
println!("Leftward ray from right:");
assert!(rect.intersects_ray(pos2(4.0, 2.0), Vec2::LEFT));
}
}

3
crates/emath/src/smart_aim.rs
View File

@@ -56,9 +56,6 @@ pub fn best_in_range_f64(min: f64, max: f64) -> f64 {
let min_str = to_decimal_string(min / exp_factor);
let max_str = to_decimal_string(max / exp_factor);
// eprintln!("min_str: {:?}", min_str);
// eprintln!("max_str: {:?}", max_str);
let mut ret_str = [0; NUM_DECIMALS];
// Select the common prefix:

8
crates/epaint/src/tessellator.rs
View File

@@ -1749,8 +1749,12 @@ impl Tessellator {
}
if galley.pixels_per_point != self.pixels_per_point {
eprintln!("epaint: WARNING: pixels_per_point (dpi scale) have changed between text layout and tessellation. \
You must recreate your text shapes if pixels_per_point changes.");
let warn = "epaint: WARNING: pixels_per_point (dpi scale) have changed between text layout and tessellation. \
You must recreate your text shapes if pixels_per_point changes.";
#[cfg(feature = "log")]
log::warn!("{warn}");
#[cfg(not(feature = "log"))]
println!("{warn}");
}
out.vertices.reserve(galley.num_vertices);