1
0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 21:30:03 -04:00

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

<!--
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

View File

@@ -25,5 +25,6 @@ env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
] }
log = { workspace = true }
puffin = "0.19"
puffin_http = "0.16"

View File

@@ -9,6 +9,8 @@ use std::sync::{
use eframe::egui;
fn main() -> eframe::Result {
let rust_log = std::env::var("RUST_LOG").unwrap_or_else(|_| "info".to_owned());
std::env::set_var("RUST_LOG", rust_log);
env_logger::init(); // Log to stderr (if you run with `RUST_LOG=debug`).
start_puffin_server(); // NOTE: you may only want to call this if the users specifies some flag or clicks a button!
@@ -153,7 +155,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")
@@ -167,7 +169,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}");
}
};
}

View File

@@ -20,3 +20,4 @@ env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
] }
log = { workspace = true }

View File

@@ -12,7 +12,7 @@ fn main() -> eframe::Result {
..Default::default()
};
eprintln!("Starting first window…");
log::info!("Starting first window…");
eframe::run_native(
"First Window",
options.clone(),
@@ -21,7 +21,7 @@ fn main() -> eframe::Result {
std::thread::sleep(std::time::Duration::from_secs(2));
eprintln!("Starting second window…");
log::info!("Starting second window…");
eframe::run_native(
"Second Window",
options.clone(),
@@ -30,7 +30,7 @@ fn main() -> eframe::Result {
std::thread::sleep(std::time::Duration::from_secs(2));
eprintln!("Starting third window…");
log::info!("Starting third window…");
eframe::run_native(
"Third Window",
options,
@@ -53,7 +53,7 @@ impl eframe::App for MyApp {
ui.label(label_text);
if ui.button("Close").clicked() {
eprintln!("Pressed Close button");
log::info!("Pressed Close button");
ui.ctx().send_viewport_cmd(egui::ViewportCommand::Close);
}
});