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.

Sign up for GitHub

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

Jump to bottom

Bump rfd and env_logger #4164

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+533 −303
Draft

Bump rfd and env_logger #4164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
782 changes: 506 additions & 276 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/eframe/src/icon_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl IconDataExt for IconData {
image
.write_to(
&mut std::io::Cursor::new(&mut png_bytes),
image::ImageOutputFormat::Png,
image::ImageFormat::Png,
)
.map_err(|err| err.to_string())?;
Ok(png_bytes)
Expand Down
2 changes: 1 addition & 1 deletion crates/eframe/src/native/app_icon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ fn set_app_icon_windows(icon_data: &IconData) -> AppIconStatus {
if image_scaled
.write_to(
&mut std::io::Cursor::new(&mut image_scaled_bytes),
image::ImageOutputFormat::Png,
image::ImageFormat::Png,
)
.is_err()
{
Expand Down
4 changes: 2 additions & 2 deletions crates/egui_demo_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ serde = { version = "1", optional = true, features = ["derive"] }

# native:
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
rfd = { version = "0.13", optional = true }
rfd = { version = "0.14", optional = true }

# web:
[target.'cfg(target_arch = "wasm32")'.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion examples/confirm_exit/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_3d_glow/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_font/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_font_style/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_keypad/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ eframe = { workspace = true, features = [
# For image support:
egui_extras = { workspace = true, features = ["default", "image"] }

env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_plot_manipulation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ eframe = { workspace = true, features = [
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
egui_plot.workspace = true
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/custom_window_frame/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
4 changes: 2 additions & 2 deletions examples/file_dialog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
rfd = "0.13"
rfd = "0.14"
2 changes: 1 addition & 1 deletion examples/hello_world/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ eframe = { workspace = true, features = [
# For image support:
egui_extras = { workspace = true, features = ["default", "image"] }

env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/hello_world_par/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ eframe = { workspace = true, default-features = false, features = [
"default_fonts",
"wgpu",
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/hello_world_simple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/images/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ eframe = { workspace = true, features = [
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
egui_extras = { workspace = true, features = ["default", "all_loaders"] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
Expand Down
2 changes: 1 addition & 1 deletion examples/keyboard_events/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/multiple_viewports/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/puffin_profiler/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ eframe = { workspace = true, features = [
"puffin",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
Expand Down
4 changes: 2 additions & 2 deletions examples/save_plot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ eframe = { workspace = true, features = [
] }
egui_plot.workspace = true
image = { version = "0.24", default-features = false, features = ["png"] }
rfd = "0.13.0"
env_logger = { version = "0.10", default-features = false, features = [
rfd = "0.14"
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/screenshot/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ eframe = { workspace = true, features = [
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
"wgpu",
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
Expand Down
2 changes: 1 addition & 1 deletion examples/serial_windows/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/test_inline_glow_paint/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/test_viewports/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
2 changes: 1 addition & 1 deletion examples/user_attention/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ eframe = { workspace = true, features = [
"default",
"__screenshot", # __screenshot is so we can dump a screenshot using EFRAME_SCREENSHOT_TO
] }
env_logger = { version = "0.10", default-features = false, features = [
env_logger = { version = "0.11", default-features = false, features = [
"auto-color",
"humantime",
] }
Loading