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

Update all examples, all tests, and egui_demo_app to use env_logger 0.11 #4949

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+102 −31
Open

Update all examples, all tests, and egui_demo_app to use env_logger 0.11 #4949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c388a4a
Update examples, tests, and egui_demo_app to use env_logger 0.11
LikeLakers2 Aug 12, 2024
4127a9a
Revert some styling changes that a VSCode extension of mine caused
LikeLakers2 Aug 12, 2024
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
87 changes: 79 additions & 8 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,54 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"

[[package]]
name = "anstream"
version = "0.6.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
dependencies = [
"anstyle",
"anstyle-parse",
"anstyle-query",
"anstyle-wincon",
"colorchoice",
"is_terminal_polyfill",
"utf8parse",
]

[[package]]
name = "anstyle"
version = "1.0.4"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"

[[package]]
name = "anstyle-parse"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
dependencies = [
"utf8parse",
]

[[package]]
name = "anstyle-query"
version = "1.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "anstyle-wincon"
version = "3.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
dependencies = [
"anstyle",
"windows-sys 0.52.0",
]

[[package]]
name = "anyhow"
Expand Down Expand Up @@ -818,6 +861,12 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"

[[package]]
name = "colorchoice"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"

[[package]]
name = "com"
version = "0.6.0"
Expand Down Expand Up @@ -1420,16 +1469,26 @@ dependencies = [
"syn 2.0.48",
]

[[package]]
name = "env_filter"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f2c92ceda6ceec50f43169f9ee8424fe2db276791afde7b2cd8bc084cb376ab"
dependencies = [
"log",
]

[[package]]
name = "env_logger"
version = "0.10.0"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0"
checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d"
dependencies = [
"anstream",
"anstyle",
"env_filter",
"humantime",
"is-terminal",
"log",
"termcolor",
]

[[package]]
Expand Down Expand Up @@ -2187,6 +2246,12 @@ dependencies = [
"windows-sys 0.48.0",
]

[[package]]
name = "is_terminal_polyfill"
version = "1.70.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"

[[package]]
name = "itertools"
version = "0.10.5"
Expand Down Expand Up @@ -2345,9 +2410,9 @@ dependencies = [

[[package]]
name = "log"
version = "0.4.20"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

[[package]]
name = "lz4_flex"
Expand Down Expand Up @@ -4172,6 +4237,12 @@ dependencies = [
"tiny-skia-path",
]

[[package]]
name = "utf8parse"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"

Copy link
Owner

Choose a reason for hiding this comment

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

This adds a lot of dependencies - is there a way to avoid them with feature-flags on env_logger, or by using an alternative crate?

Copy link
Author

@LikeLakers2 LikeLakers2 Aug 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I don't think so.

That said, these extra dependencies are only compiled alongside examples and tests - not alongside egui itself. Thus, I doubt they'll be much of an issue, unless you're constantly running cargo clean.

[[package]]
name = "version-compare"
version = "0.1.1"
Expand Down
2 changes: 1 addition & 1 deletion crates/egui_demo_app/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ serde = { workspace = true, optional = true }

# 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",
] }
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 @@ -16,7 +16,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 @@ -16,7 +16,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 @@ -16,7 +16,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 @@ -16,7 +16,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 @@ -20,7 +20,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_window_frame/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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/file_dialog/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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",
] }
Expand Down
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 @@ -20,7 +20,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 @@ -19,7 +19,7 @@ eframe = { workspace = true, default-features = false, features = [
"x11",
"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/hello_world_simple/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,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 @@ -17,7 +17,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 @@ -16,7 +16,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 @@ -18,7 +18,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/popups/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",
] }
Expand Down
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 @@ -21,7 +21,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
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 @@ -20,7 +20,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 @@ -16,7 +16,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 @@ -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 tests/test_inline_glow_paint/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 = [
"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 tests/test_size_pass/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 = [
"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 tests/test_ui_stack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ eframe = { workspace = true, features = [
# For image support:
egui_extras = { workspace = true, features = ["default", "image", "serde"] }

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 tests/test_viewports/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 = [
"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",
] }