From 24f7739f75a0e65d00d0b72744a053b2f902269b Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 18:55:07 +0400 Subject: [PATCH 1/5] chore: fix clippy warning --- devenv-tasks/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devenv-tasks/src/lib.rs b/devenv-tasks/src/lib.rs index 5016bd119..8774a477c 100644 --- a/devenv-tasks/src/lib.rs +++ b/devenv-tasks/src/lib.rs @@ -811,7 +811,7 @@ impl TasksUi { .max(1) ) ); - if tasks_status.lines.len() > 0 { + if !tasks_status.lines.is_empty() { let output = console::Style::new().apply_to(output); if last_list_height > 0 { term.move_cursor_up(last_list_height as usize)?; From 1f19e9d37a8ef6fbf2b067445fd56d8530f6d129 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 18:56:39 +0400 Subject: [PATCH 2/5] test: fix opencollector check --- examples/opentelemetry-collector/.test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/opentelemetry-collector/.test.sh b/examples/opentelemetry-collector/.test.sh index 1569a1e00..5be845cb7 100755 --- a/examples/opentelemetry-collector/.test.sh +++ b/examples/opentelemetry-collector/.test.sh @@ -4,4 +4,4 @@ set -ex endpoint="http://localhost:13133/" timeout 20 bash -c "until curl $endpoint 2>/dev/null; do sleep 0.5; done" -curl -s "$endpoint" | grep "Server available" +curl -s "$endpoint" | grep "Server" From 8c2e3653c85e3094dd6d6807b3d46670044045ac Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 18:57:06 +0400 Subject: [PATCH 3/5] test: wait for postgres to launch before running rails --- examples/rubyonrails/devenv.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/rubyonrails/devenv.nix b/examples/rubyonrails/devenv.nix index 066760654..bd823c775 100644 --- a/examples/rubyonrails/devenv.nix +++ b/examples/rubyonrails/devenv.nix @@ -20,7 +20,10 @@ services.postgres.enable = true; - processes.rails.exec = "cd blog && rails server"; + processes.rails = { + exec = "cd blog && rails server"; + process-compose.depends_on.postgres.condition = "process_healthy"; + }; enterShell = '' export PATH="$DEVENV_ROOT/blog/bin:$PATH" From 565f629482fed488fda65811afffac1d97c2403a Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 18:57:38 +0400 Subject: [PATCH 4/5] test: fix rust-wasm-cross We were running clippy on the parent repo, not the demo crate. --- examples/rust-wasm-cross/.test.sh | 2 +- examples/rust-wasm-cross/{app => }/Cargo.lock | 49 ++++++++++--------- examples/rust-wasm-cross/{app => }/Cargo.toml | 0 examples/rust-wasm-cross/{app => }/src/lib.rs | 0 4 files changed, 26 insertions(+), 25 deletions(-) rename examples/rust-wasm-cross/{app => }/Cargo.lock (63%) rename examples/rust-wasm-cross/{app => }/Cargo.toml (100%) rename examples/rust-wasm-cross/{app => }/src/lib.rs (100%) diff --git a/examples/rust-wasm-cross/.test.sh b/examples/rust-wasm-cross/.test.sh index eac95a9f7..4a6e84207 100755 --- a/examples/rust-wasm-cross/.test.sh +++ b/examples/rust-wasm-cross/.test.sh @@ -6,6 +6,6 @@ rustc --version [[ "$CARGO_INSTALL_ROOT" == "$DEVENV_STATE/cargo-install" ]] echo "$PATH" | grep -- "$CARGO_INSTALL_ROOT/bin" -wasm-pack build ./app --target nodejs +wasm-pack build ./. --target nodejs node .test.js diff --git a/examples/rust-wasm-cross/app/Cargo.lock b/examples/rust-wasm-cross/Cargo.lock similarity index 63% rename from examples/rust-wasm-cross/app/Cargo.lock rename to examples/rust-wasm-cross/Cargo.lock index a546e9e9f..0007a6577 100644 --- a/examples/rust-wasm-cross/app/Cargo.lock +++ b/examples/rust-wasm-cross/Cargo.lock @@ -11,9 +11,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "cfg-if" @@ -23,39 +23,39 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[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 = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "proc-macro2" -version = "1.0.70" +version = "1.0.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "2.0.41" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -64,25 +64,26 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "wasm-bindgen" -version = "0.2.89" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ed0d4f68a3015cc185aff4db9506a015f4b96f95303897bfa23f846db54064e" +checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.89" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b56f625e64f3a1084ded111c4d5f477df9f8c92df113852fa5a374dbda78826" +checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" dependencies = [ "bumpalo", "log", @@ -95,9 +96,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.89" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2" +checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -105,9 +106,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.89" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283" +checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" dependencies = [ "proc-macro2", "quote", @@ -118,6 +119,6 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.89" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f" +checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" diff --git a/examples/rust-wasm-cross/app/Cargo.toml b/examples/rust-wasm-cross/Cargo.toml similarity index 100% rename from examples/rust-wasm-cross/app/Cargo.toml rename to examples/rust-wasm-cross/Cargo.toml diff --git a/examples/rust-wasm-cross/app/src/lib.rs b/examples/rust-wasm-cross/src/lib.rs similarity index 100% rename from examples/rust-wasm-cross/app/src/lib.rs rename to examples/rust-wasm-cross/src/lib.rs From c374482658826f2b30b12c3f9544c637364b3979 Mon Sep 17 00:00:00 2001 From: Sander Date: Wed, 16 Oct 2024 23:03:02 +0400 Subject: [PATCH 5/5] example: fix rust-wasm example --- examples/rust-wasm-cross/Cargo.lock | 2 +- examples/rust-wasm-cross/devenv.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/rust-wasm-cross/Cargo.lock b/examples/rust-wasm-cross/Cargo.lock index 0007a6577..6cb985a42 100644 --- a/examples/rust-wasm-cross/Cargo.lock +++ b/examples/rust-wasm-cross/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "app" diff --git a/examples/rust-wasm-cross/devenv.nix b/examples/rust-wasm-cross/devenv.nix index 549531d18..a9b2cbd0f 100644 --- a/examples/rust-wasm-cross/devenv.nix +++ b/examples/rust-wasm-cross/devenv.nix @@ -4,7 +4,7 @@ languages.rust = { enable = true; # https://devenv.sh/reference/options/#languagesrustchannel - channel = "nightly"; + channel = "stable"; targets = [ "wasm32-unknown-unknown" ];