Bump indexmap from 1.9.3 to 2.0.0

.github/workflows/main-checks.yml

@@ -48,7 +48,7 @@ jobs:
  - uses: browser-actions/setup-geckodriver@latest
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
- - uses: nanasess/setup-chromedriver@v1
+ - uses: nanasess/setup-chromedriver@v2
 
  - name: Run doctest
  run: |
@@ -67,7 +67,7 @@ jobs:
  fail-fast: false
  matrix:
  toolchain:
- - 1.60.0
+ - 1.64.0
  - stable
 
  steps:
@@ -116,7 +116,7 @@ jobs:
  fail-fast: false
  matrix:
  toolchain:
- - 1.60.0
+ - 1.64.0
  - stable
  - nightly
 

.github/workflows/test-website.yml

@@ -44,7 +44,7 @@ jobs:
  with:
  token: ${{ secrets.GITHUB_TOKEN }}
 
- - uses: nanasess/setup-chromedriver@v1
+ - uses: nanasess/setup-chromedriver@v2
 
  - name: Run website code snippet tests
  run: cargo test -p website-test --target wasm32-unknown-unknown

packages/yew-macro/Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0"
 keywords = ["web", "wasm", "frontend", "webasm", "webassembly"]
 categories = ["gui", "web-programming", "wasm"]
 description = "A framework for making client-side single-page apps"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 [lib]
 proc-macro = true

packages/yew-macro/Makefile.toml

@@ -1,6 +1,6 @@
 [tasks.test]
 clear = true
-toolchain = "1.60.0"
+toolchain = "1.64.0"
 command = "cargo"
 # test target can be optionally specified like `cargo make test html_macro`,
 args = ["test", "${@}"]

packages/yew-macro/src/hook/mod.rs

@@ -133,8 +133,8 @@ pub fn hook_impl(hook: HookFn) -> syn::Result<TokenStream> {
 
  let inner_type_impl = if hook_sig.needs_boxing {
  let with_output = !matches!(hook_sig.output_type, Type::ImplTrait(_),);
- let inner_fn_rt = with_output.then(|| &inner_fn_rt);
- let output_type = with_output.then(|| &output_type);
+ let inner_fn_rt = with_output.then_some(&inner_fn_rt);
+ let output_type = with_output.then_some(&output_type);
 
  let hook_lifetime = &hook_sig.hook_lifetime;
  let hook_lifetime_plus = quote! { #hook_lifetime + };

packages/yew-macro/tests/classes_macro_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn classes_macro() {
  let t = trybuild::TestCases::new();
  t.pass("tests/classes_macro/*-pass.rs");

packages/yew-macro/tests/derive_props_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn derive_props() {
  let t = trybuild::TestCases::new();
  t.pass("tests/derive_props/pass.rs");

packages/yew-macro/tests/function_attr_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn tests() {
  let t = trybuild::TestCases::new();
  t.pass("tests/function_component_attr/*-pass.rs");

packages/yew-macro/tests/hook_attr_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn tests() {
  let t = trybuild::TestCases::new();
  t.pass("tests/hook_attr/*-pass.rs");

packages/yew-macro/tests/hook_macro_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn tests() {
  let t = trybuild::TestCases::new();
  t.pass("tests/hook_macro/*-pass.rs");

packages/yew-macro/tests/html_macro_test.rs

@@ -1,7 +1,7 @@
 use yew::{html, html_nested};
 
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn html_macro() {
  let t = trybuild::TestCases::new();
 

packages/yew-macro/tests/props_macro_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn props_macro() {
  let t = trybuild::TestCases::new();
  t.pass("tests/props_macro/*-pass.rs");

packages/yew-router-macro/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 license = "MIT OR Apache-2.0"
 description = "Contains macros used with yew-router"
 repository = "https://github.com/yewstack/yew"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 [lib]
 proc-macro = true

packages/yew-router-macro/Makefile.toml

@@ -1,6 +1,6 @@
 [tasks.test]
 clear = true
-toolchain = "1.60.0"
+toolchain = "1.64.0"
 command = "cargo"
 args = ["test"]
 

packages/yew-router-macro/tests/routable_derive_test.rs

@@ -1,5 +1,5 @@
 #[allow(dead_code)]
-#[rustversion::attr(stable(1.60), test)]
+#[rustversion::attr(stable(1.64), test)]
 fn tests() {
  let t = trybuild::TestCases::new();
  t.pass("tests/routable_derive/*-pass.rs");

packages/yew-router/Cargo.toml

@@ -9,7 +9,7 @@ keywords = ["web", "yew", "router"]
 categories = ["gui", "web-programming"]
 description = "A router implementation for the Yew framework"
 repository = "https://github.com/yewstack/yew"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 [dependencies]
 yew = { version = "0.20.0", path = "../yew", default-features= false }

packages/yew/Cargo.toml

@@ -14,20 +14,20 @@ keywords = ["web", "webasm", "javascript"]
 categories = ["gui", "wasm", "web-programming"]
 description = "A framework for creating reliable and efficient web applications"
 readme = "../../README.md"
-rust-version = "1.60.0"
+rust-version = "1.64.0"
 
 [dependencies]
 console_error_panic_hook = "0.1"
 gloo = "0.8"
-indexmap = { version = "1", features = ["std"] }
+indexmap = { version = "2", features = ["std"] }
 js-sys = "0.3"
 slab = "0.4"
 wasm-bindgen = "0.2"
 yew-macro = { version = "^0.20.0", path = "../yew-macro" }
 thiserror = "1.0"
 futures = { version = "0.3", default-features = false, features = ["std"] }
 html-escape = { version = "0.2.13", optional = true }
-implicit-clone = { version = "0.3", features = ["map"] }
+implicit-clone = { version = "0.3.8", features = ["map"] }
 base64ct = { version = "1.6.0", features = ["std"], optional = true }
 bincode = { version = "1.3.3", optional = true }
 serde = { version = "1", features = ["derive"] }

packages/yew/src/functional/mod.rs

@@ -337,7 +337,7 @@ where
  };
 
  Self {
- _never: std::marker::PhantomData::default(),
+ _never: std::marker::PhantomData,
  hook_ctx: HookContext::new(
  scope,
  re_render,

packages/yew/src/utils/mod.rs

@@ -19,34 +19,25 @@ pub struct NodeSeq<IN, OUT>(Vec<OUT>, PhantomData<IN>);
 
 impl<IN: Into<OUT>, OUT> From<IN> for NodeSeq<IN, OUT> {
  fn from(val: IN) -> Self {
- Self(vec![val.into()], PhantomData::default())
+ Self(vec![val.into()], PhantomData)
  }
 }
 
 impl<IN: Into<OUT>, OUT> From<Option<IN>> for NodeSeq<IN, OUT> {
  fn from(val: Option<IN>) -> Self {
- Self(
- val.map(|s| vec![s.into()]).unwrap_or_default(),
- PhantomData::default(),
- )
+ Self(val.map(|s| vec![s.into()]).unwrap_or_default(), PhantomData)
  }
 }
 
 impl<IN: Into<OUT>, OUT> From<Vec<IN>> for NodeSeq<IN, OUT> {
  fn from(val: Vec<IN>) -> Self {
- Self(
- val.into_iter().map(|x| x.into()).collect(),
- PhantomData::default(),
- )
+ Self(val.into_iter().map(|x| x.into()).collect(), PhantomData)
  }
 }
 
 impl<IN: Into<OUT> + Clone, OUT> From<&ChildrenRenderer<IN>> for NodeSeq<IN, OUT> {
  fn from(val: &ChildrenRenderer<IN>) -> Self {
- Self(
- val.iter().map(|x| x.into()).collect(),
- PhantomData::default(),
- )
+ Self(val.iter().map(|x| x.into()).collect(), PhantomData)
  }
 }
 

website/docs/getting-started/introduction.mdx

@@ -11,7 +11,7 @@ bundler for Rust.
 To install Rust, follow the [official instructions](https://www.rust-lang.org/tools/install).
 
 :::important
-The minimum supported Rust version (MSRV) for Yew is `1.60.0`. Older versions will not compile.
+The minimum supported Rust version (MSRV) for Yew is `1.64.0`. Older versions will not compile.
 You can check your toolchain version using
 `rustup show` (under "active toolchain") or `rustc --version`. To update your
 toolchain, run `rustup update`.