diff --git a/cargo-shuttle/src/init.rs b/cargo-shuttle/src/init.rs index 1ceb5f4ef3..ed86a2c941 100644 --- a/cargo-shuttle/src/init.rs +++ b/cargo-shuttle/src/init.rs @@ -23,6 +23,13 @@ pub trait ShuttleInit { pub struct ShuttleInitActixWeb; +impl ShuttleInitActixWeb { + fn get_zstd_dep(_: &str, _: bool, _: &Path, _: &Url) -> String { + // it does not compile in the case of the latest dependency + String::from("=2.0.1+zstd.1.5.2") + } +} + impl ShuttleInit for ShuttleInitActixWeb { fn set_cargo_dependencies( &self, @@ -45,7 +52,7 @@ impl ShuttleInit for ShuttleInitActixWeb { manifest_path, url, false, - get_dependency_version_fn, + Self::get_zstd_dep, ); set_inline_table_dependency_features( @@ -974,7 +981,7 @@ mod shuttle_init_tests { [dependencies] shuttle-service = { version = "1.0", features = ["web-actix-web"] } actix-web = "1.0" - zstd-sys = "1.0" + zstd-sys = "=2.0.1+zstd.1.5.2" "#}; assert_eq!(cargo_toml.to_string(), expected); diff --git a/examples b/examples index ef62af0ae9..625470f862 160000 --- a/examples +++ b/examples @@ -1 +1 @@ -Subproject commit ef62af0ae97d5bf8ce37ad663fdd3b1ace5826ed +Subproject commit 625470f86286e899a8a0a518e28db49e956f0244 diff --git a/service/Cargo.toml b/service/Cargo.toml index 66fc1363d1..e3d9c73b97 100644 --- a/service/Cargo.toml +++ b/service/Cargo.toml @@ -38,7 +38,7 @@ tracing = "0.1.36" tracing-subscriber = { version = "0.3.15", features = ["env-filter"] } uuid = { version = "1.1.2", features = ["v4"] } warp = { version = "0.3.2", optional = true } -zstd-sys = { version = "2.0.1+zstd.1.5.2", optional = true } +zstd-sys = { version = "=2.0.1+zstd.1.5.2", optional = true } # Tide does not have tokio support. So make sure async-std is compatible with tokio # https://github.com/http-rs/tide/issues/791