diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2f7ac88..47df713 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,7 @@ jobs: if: runner.os == 'Linux' uses: awalsh128/cache-apt-pkgs-action@v1.3.0 with: - packages: libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev + packages: libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev librust-atk-dev version: 1.0 execute_install_scripts: true @@ -152,4 +152,4 @@ jobs: - name: Download and install Trunk binary run: wget -qO- https://github.com/thedodd/trunk/releases/latest/download/trunk-x86_64-unknown-linux-gnu.tar.gz | tar -xzf- - name: Build - run: ./trunk build + run: cd demo && ../trunk build diff --git a/Cargo.lock b/Cargo.lock index 529bb7b..ee00725 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -845,7 +845,7 @@ dependencies = [ [[package]] name = "demo" -version = "0.1.0" +version = "0.28.1" dependencies = [ "eframe", "egui", diff --git a/demo/Cargo.toml b/demo/Cargo.toml index b208424..6360bcc 100644 --- a/demo/Cargo.toml +++ b/demo/Cargo.toml @@ -1,10 +1,12 @@ [package] -name = "demo" -version = "0.1.0" authors = ["Emil Ernerfeldt "] -edition = "2021" -include = ["LICENSE-APACHE", "LICENSE-MIT", "**/*.rs", "Cargo.toml"] -rust-version = "1.76" +edition.workspace = true +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] +license.workspace = true +name = "demo" +publish = false +rust-version.workspace = true +version.workspace = true [lints] workspace = true diff --git a/demo/src/plot_demo.rs b/demo/src/plot_demo.rs index d78540f..a669648 100644 --- a/demo/src/plot_demo.rs +++ b/demo/src/plot_demo.rs @@ -515,7 +515,7 @@ impl CustomAxesDemo { let time_formatter = |mark: GridMark, _range: &RangeInclusive| { let minutes = mark.value; - if minutes < 0.0 || 5.0 * MINS_PER_DAY <= minutes { + if !(0.0..5.0 * MINS_PER_DAY).contains(&minutes) { // No labels outside value bounds String::new() } else if is_approx_integer(minutes / MINS_PER_DAY) { diff --git a/deny.toml b/deny.toml index 7f92023..86f03ef 100644 --- a/deny.toml +++ b/deny.toml @@ -43,7 +43,7 @@ deny = [ ] skip = [] -skip-tree = [] +skip-tree = [{ name = "eframe", reason = "Dev-dependency" }] [licenses] diff --git a/egui_plot/Cargo.toml b/egui_plot/Cargo.toml index 9717fd0..89877aa 100644 --- a/egui_plot/Cargo.toml +++ b/egui_plot/Cargo.toml @@ -1,21 +1,21 @@ [package] -name = "egui_plot" -version.workspace = true authors = [ "Emil Ernerfeldt ", # https://github.com/emilk "Jan Haller ", # https://github.com/Bromeon "Sven Niederberger ", # https://github.com/EmbersArc ] +categories = ["visualization", "gui"] description = "Immediate mode plotting for the egui GUI library" edition.workspace = true -rust-version.workspace = true -homepage = "https://github.com/emilk/egui" +homepage = "https://github.com/emilk/egui_plot" +include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] +keywords = ["egui", "plot", "plotting"] license.workspace = true +name = "egui_plot" readme = "README.md" -repository = "https://github.com/emilk/egui" -categories = ["visualization", "gui"] -keywords = ["egui", "plot", "plotting"] -include = ["../LICENSE-APACHE", "../LICENSE-MIT", "**/*.rs", "Cargo.toml"] +repository = "https://github.com/emilk/egui_plot" +rust-version.workspace = true +version.workspace = true [lints] workspace = true diff --git a/egui_plot/src/lib.rs b/egui_plot/src/lib.rs index f6e9123..50b12cf 100644 --- a/egui_plot/src/lib.rs +++ b/egui_plot/src/lib.rs @@ -737,6 +737,7 @@ impl<'a> Plot<'a> { } #[allow(clippy::too_many_lines)] // TODO(emilk): shorten this function + #[allow(clippy::type_complexity)] // build_fn fn show_dyn( self, ui: &mut Ui,