From b3afe89be1e0a5fdeffb27c630970a2a912dd5b0 Mon Sep 17 00:00:00 2001 From: David Campbell Date: Sat, 14 Sep 2024 15:13:14 -0400 Subject: [PATCH 1/7] Add rust-version. --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index 52464e3870..fbf6a01ee7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -119,6 +119,7 @@ members = [ version = "0.13.0-dev" authors = ["Héctor Ramón Jiménez "] edition = "2021" +rust-version = "1.75.0" license = "MIT" repository = "https://github.com/iced-rs/iced" homepage = "https://iced.rs" From 850b3d579d4f9a131c90a48f592ebdb88739f7dc Mon Sep 17 00:00:00 2001 From: David Campbell Date: Sat, 14 Sep 2024 15:22:08 -0400 Subject: [PATCH 2/7] Add to workspaces. --- Cargo.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Cargo.toml b/Cargo.toml index fbf6a01ee7..296fef9830 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,6 +3,7 @@ name = "iced" description = "A cross-platform GUI library inspired by Elm" version.workspace = true edition.workspace = true +rust-version.workspace = true authors.workspace = true license.workspace = true repository.workspace = true From 72e75e04914a7663b74a90ece004f135f5012137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 18 Sep 2024 20:45:56 +0200 Subject: [PATCH 3/7] Remove trailing `0` in `rust-version` --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 296fef9830..82b60faa4b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,13 +3,13 @@ name = "iced" description = "A cross-platform GUI library inspired by Elm" version.workspace = true edition.workspace = true -rust-version.workspace = true authors.workspace = true license.workspace = true repository.workspace = true homepage.workspace = true categories.workspace = true keywords.workspace = true +rust-version.workspace = true [lints] workspace = true @@ -120,12 +120,12 @@ members = [ version = "0.13.0-dev" authors = ["Héctor Ramón Jiménez "] edition = "2021" -rust-version = "1.75.0" license = "MIT" repository = "https://github.com/iced-rs/iced" homepage = "https://iced.rs" categories = ["gui"] keywords = ["gui", "ui", "graphics", "interface", "widgets"] +rust-version = "1.75" [workspace.dependencies] iced = { version = "0.13.0-dev", path = "." } From cfe912cbc32772fb9549c1f17fce202f3eb2ad99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 18 Sep 2024 21:03:37 +0200 Subject: [PATCH 4/7] Add MSRV to test matrix in GitHub CI --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 47c61f5e85..d75c59ea91 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - rust: [stable, beta] + rust: [stable, beta, 1.75] steps: - uses: hecrj/setup-rust-action@v2 with: From 14353c285f4e65bd58e7d109a6dc7d598dd9cb65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 18 Sep 2024 21:12:50 +0200 Subject: [PATCH 5/7] Bump MSRV to `1.77` --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d75c59ea91..225b3d92f2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - rust: [stable, beta, 1.75] + rust: [stable, beta, 1.77] steps: - uses: hecrj/setup-rust-action@v2 with: diff --git a/Cargo.toml b/Cargo.toml index 82b60faa4b..35133f977d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -125,7 +125,7 @@ repository = "https://github.com/iced-rs/iced" homepage = "https://iced.rs" categories = ["gui"] keywords = ["gui", "ui", "graphics", "interface", "widgets"] -rust-version = "1.75" +rust-version = "1.77" [workspace.dependencies] iced = { version = "0.13.0-dev", path = "." } From 71af846c6d0feab483a2b4e8bcd49a2ccc31f478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 18 Sep 2024 21:51:12 +0200 Subject: [PATCH 6/7] Remove redundant import in `markdown` widget --- widget/src/markdown.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/widget/src/markdown.rs b/widget/src/markdown.rs index fa4ee6bf03..4bcd33530e 100644 --- a/widget/src/markdown.rs +++ b/widget/src/markdown.rs @@ -239,7 +239,7 @@ pub fn parse(markdown: &str) -> impl Iterator + '_ { ) if !metadata && !table => { #[cfg(feature = "highlighter")] { - use iced_highlighter::{self, Highlighter}; + use iced_highlighter::Highlighter; use text::Highlighter as _; highlighter = From 15e6c949d73fa43285ad713c5abe32355823956f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Wed, 18 Sep 2024 21:51:19 +0200 Subject: [PATCH 7/7] Bump MSRV to `1.80` --- .github/workflows/test.yml | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 225b3d92f2..ea941509b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macOS-latest] - rust: [stable, beta, 1.77] + rust: [stable, beta, "1.80"] steps: - uses: hecrj/setup-rust-action@v2 with: diff --git a/Cargo.toml b/Cargo.toml index 35133f977d..04ac35ed49 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -125,7 +125,7 @@ repository = "https://github.com/iced-rs/iced" homepage = "https://iced.rs" categories = ["gui"] keywords = ["gui", "ui", "graphics", "interface", "widgets"] -rust-version = "1.77" +rust-version = "1.80" [workspace.dependencies] iced = { version = "0.13.0-dev", path = "." }