Skip to content

Commit

Permalink
clippy fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@emilk
emilk committed Dec 16, 2024
1 parent 052a3ee commit b4b1e57
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 105 deletions.
129 changes: 32 additions & 97 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046"

[[package]]
name = "accesskit"
version = "0.16.0"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4700bdc115b306d6c43381c344dc307f03b7f0460c304e4892c309930322bd7"
checksum = "d3d3b8f9bae46a948369bc4a03e815d4ed6d616bd00de4051133a5019dc31c5a"
dependencies = [
"enumn",
"serde",
Expand All @@ -47,7 +47,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"getrandom",
"once_cell",
"serde",
"version_check",
Expand Down Expand Up @@ -96,12 +95,6 @@ dependencies = [
"x11rb",
]

[[package]]
name = "as-raw-xcb-connection"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b"

[[package]]
name = "atomic-waker"
version = "1.1.2"
Expand Down Expand Up @@ -387,9 +380,9 @@ checksum = "f25c0e292a7ca6d6498557ff1df68f32c99850012b6ea401cf8daf771f22ff53"

[[package]]
name = "ecolor"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5629649a8ae57c73f175f4a96419905a8102cfbfcbce96ea25a826bbf468e990"
checksum = "7d72e9c39f6e11a2e922d04a34ec5e7ef522ea3f5a1acfca7a19d16ad5fe50f5"
dependencies = [
"bytemuck",
"emath",
Expand All @@ -398,9 +391,9 @@ dependencies = [

[[package]]
name = "eframe"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712634e63d86f5eb8e30f880bc4803b79dcc82539aec1a28fde86ed839daed24"
checksum = "b2f2d9e7ea2d11ec9e98a8683b6eb99f9d7d0448394ef6e0d6d91bd4eb817220"
dependencies = [
"ahash",
"bytemuck",
Expand All @@ -420,6 +413,7 @@ dependencies = [
"objc2-foundation",
"parking_lot",
"percent-encoding",
"profiling",
"raw-window-handle",
"ron",
"serde",
Expand All @@ -429,36 +423,38 @@ dependencies = [
"web-sys",
"web-time",
"winapi",
"windows-sys 0.52.0",
"windows-sys 0.59.0",
"winit",
]

[[package]]
name = "egui"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26bab3b3572566257a497b5f87d2cccaf7f7f122d4b8b620cba0493becc7955e"
checksum = "252d52224d35be1535d7fd1d6139ce071fb42c9097773e79f7665604f5596b5e"
dependencies = [
"accesskit",
"ahash",
"emath",
"epaint",
"log",
"nohash-hasher",
"profiling",
"ron",
"serde",
]

[[package]]
name = "egui-winit"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "642c749bf221b5a3ecae3144c98b837729d87b9fde6c39a6ad00f07b71dbee94"
checksum = "1e84c2919cd9f3a38a91e8f84ac6a245c19251fd95226ed9fae61d5ea564fce3"
dependencies = [
"ahash",
"arboard",
"egui",
"log",
"profiling",
"raw-window-handle",
"serde",
"smithay-clipboard",
Expand All @@ -469,16 +465,17 @@ dependencies = [

[[package]]
name = "egui_glow"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea182206896187f7a2fcc207a1573785fc31330cb245f6cebcf663ea933f8d20"
checksum = "3eaf6264cc7608e3e69a7d57a6175f438275f1b3889c1a551b418277721c95e6"
dependencies = [
"ahash",
"bytemuck",
"egui",
"glow",
"log",
"memoffset",
"profiling",
"wasm-bindgen",
"web-sys",
]
Expand All @@ -494,9 +491,9 @@ dependencies = [

[[package]]
name = "emath"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af86c4efae11da2a3dcbb4afebd0e9ed1916345e8d187b4051d443c8bd79af93"
checksum = "c4fe73c1207b864ee40aa0b0c038d6092af1030744678c60188a05c28553515d"
dependencies = [
"bytemuck",
"serde",
Expand Down Expand Up @@ -527,9 +524,9 @@ dependencies = [

[[package]]
name = "epaint"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "445e11ec86a4d85e1350578ba20b2d89977ed937f3faab32e1c3ec81d20c1842"
checksum = "5666f8d25236293c966fbb3635eac18b04ad1914e3bab55bc7d44b9980cafcac"
dependencies = [
"ab_glyph",
"ahash",
Expand All @@ -540,14 +537,15 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot",
"profiling",
"serde",
]

[[package]]
name = "epaint_default_fonts"
version = "0.29.0"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5202b64bef2b2c42a7f6e2e5b40fa83dd04aa61fdb08bfd116553adc149fe47a"
checksum = "66f6ddac3e6ac6fd4c3d48bb8b1943472f8da0f43a4303bcd8a18aa594401c80"

[[package]]
name = "equivalent"
Expand Down Expand Up @@ -636,17 +634,6 @@ dependencies = [
"windows-targets 0.48.5",
]

[[package]]
name = "getrandom"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
dependencies = [
"cfg-if",
"libc",
"wasi",
]

[[package]]
name = "gl_generator"
version = "0.14.0"
Expand All @@ -660,9 +647,9 @@ dependencies = [

[[package]]
name = "glow"
version = "0.14.1"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2f4a888dbe8181a7535853469c21c67ca9a1cea9460b16808fc018ea9e55d248"
checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08"
dependencies = [
"js-sys",
"slotmap",
Expand All @@ -682,17 +669,14 @@ dependencies = [
"core-foundation",
"dispatch",
"glutin_egl_sys",
"glutin_glx_sys",
"glutin_wgl_sys",
"libloading",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"once_cell",
"raw-window-handle",
"wayland-sys",
"windows-sys 0.52.0",
"x11-dl",
]

[[package]]
Expand All @@ -717,16 +701,6 @@ dependencies = [
"windows-sys 0.52.0",
]

[[package]]
name = "glutin_glx_sys"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c2b2d3918e76e18e08796b55eb64e8fe6ec67d5a6b2e2a7e2edce224ad24c63"
dependencies = [
"gl_generator",
"x11-dl",
]

[[package]]
name = "glutin_wgl_sys"
version = "0.6.0"
Expand Down Expand Up @@ -1350,6 +1324,12 @@ dependencies = [
"unicode-ident",
]

[[package]]
name = "profiling"
version = "1.0.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "afbdc74edc00b6f6a218ca6a5364d6226a259d4b8ea1af4a0ea063f27e179f4d"

[[package]]
name = "quick-xml"
version = "0.34.0"
Expand Down Expand Up @@ -1699,12 +1679,6 @@ dependencies = [
"winapi-util",
]

[[package]]
name = "wasi"
version = "0.11.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

[[package]]
name = "wasm-bindgen"
version = "0.2.93"
Expand Down Expand Up @@ -1832,19 +1806,6 @@ dependencies = [
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-plasma"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f79f2d57c7fcc6ab4d602adba364bf59a5c24de57bd194486bf9b8360e06bfc4"
dependencies = [
"bitflags 2.6.0",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-scanner",
]

[[package]]
name = "wayland-protocols-wlr"
version = "0.3.3"
Expand Down Expand Up @@ -2161,12 +2122,10 @@ version = "0.30.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0be9e76a1f1077e04a411f0b989cbd3c93339e1771cb41e71ac4aee95bfd2c67"
dependencies = [
"ahash",
"android-activity",
"atomic-waker",
"bitflags 2.6.0",
"block2",
"bytemuck",
"calloop",
"cfg_aliases",
"concurrent-queue",
Expand All @@ -2176,33 +2135,24 @@ dependencies = [
"dpi",
"js-sys",
"libc",
"memmap2",
"ndk",
"objc2",
"objc2-app-kit",
"objc2-foundation",
"objc2-ui-kit",
"orbclient",
"percent-encoding",
"pin-project",
"raw-window-handle",
"redox_syscall 0.4.1",
"rustix",
"smithay-client-toolkit",
"smol_str",
"tracing",
"unicode-segmentation",
"wasm-bindgen",
"wasm-bindgen-futures",
"wayland-backend",
"wayland-client",
"wayland-protocols",
"wayland-protocols-plasma",
"web-sys",
"web-time",
"windows-sys 0.52.0",
"x11-dl",
"x11rb",
"xkbcommon-dl",
]

Expand All @@ -2215,28 +2165,13 @@ dependencies = [
"memchr",
]

[[package]]
name = "x11-dl"
version = "2.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f"
dependencies = [
"libc",
"once_cell",
"pkg-config",
]

[[package]]
name = "x11rb"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5d91ffca73ee7f68ce055750bf9f6eca0780b8c85eff9bc046a3b0da41755e12"
dependencies = [
"as-raw-xcb-connection",
"gethostname",
"libc",
"libloading",
"once_cell",
"rustix",
"x11rb-protocol",
]
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ opt-level = 2 # fast and small wasm
egui_table = { version = "0.1.0", path = "egui_table", default-features = false }

document-features = " 0.2.10"
eframe = { version = "0.29.0", default-features = false }
egui = { version = "0.29.0", default-features = false }
emath = { version = "0.29.0", default-features = false }
eframe = { version = "0.30.0", default-features = false }
egui = { version = "0.30.0", default-features = false }
emath = { version = "0.30.0", default-features = false }
env_logger = { version = "0.10", default-features = false, features = [
"auto-color",
"humantime",
Expand All @@ -46,13 +46,13 @@ web-sys = "0.3.4"
unsafe_code = "deny"

elided_lifetimes_in_paths = "warn"
future_incompatible = "warn"
nonstandard_style = "warn"
rust_2018_idioms = "warn"
future_incompatible = { level = "warn", priority = -1 }
nonstandard_style = { level = "warn", priority = -1 }
rust_2018_idioms = { level = "warn", priority = -1 }
rust_2021_prelude_collisions = "warn"
semicolon_in_expressions_from_macros = "warn"
trivial_numeric_casts = "warn"
unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
unsafe_op_in_unsafe_fn = "warn" # `unsafe_op_in_unsafe_fn` may become the default in future Rust versions: https://github.com/rust-lang/rust/issues/71668
unused_extern_crates = "warn"
unused_import_braces = "warn"
unused_lifetimes = "warn"
Expand Down
2 changes: 1 addition & 1 deletion demo/src/split_scroll_demo.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use egui_table::{SplitScroll, SplitScrollDelegate};
pub struct SplitScrollDemo {}

impl SplitScrollDemo {
pub fn ui(&mut self, ui: &mut egui::Ui) {
pub fn ui(&self, ui: &mut egui::Ui) {
_ = self;
let mut delegate = DemoScrollDelegate {};

Expand Down

0 comments on commit b4b1e57

Please sign in to comment.