Unverified Commit 87a62ae3 authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Eliminate dependency on `futures-macros` (#2460) 

The `futures-macros` crate is pulled in by default by `futures-util`,
and depends on `syn`. None of this functionality is used by smithy-rs.
parent 7c42e6be

aws/rust-runtime/aws-config/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ http = "0.2.4" 
tower = { version = "0.4.8" }



[dev-dependencies]

futures-util = "0.3.16"

futures-util = { version = "0.3.16", default-features = false }

tracing-test = "0.2.1"



tokio = { version = "1.8.4", features = ["full", "test-util"] }

aws/rust-runtime/aws-types/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ http = "0.2.6" 
hyper-rustls = { version = "0.23.0", optional = true, features = ["rustls-native-certs", "http2", "webpki-roots"] }



[dev-dependencies]

futures-util = "0.3.16"

futures-util = { version = "0.3.16", default-features = false }

http = "0.2.4"

tracing-test = "0.2.1"

aws/sdk/integration-tests/dynamodb/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ aws-smithy-async = { path = "../../build/aws-sdk/sdk/aws-smithy-async" } 
aws-types = { path = "../../build/aws-sdk/sdk/aws-types" }

bytes = "1.0.0"

criterion = { version = "0.4.0" }

futures-util = "0.3.16"

futures-util = { version = "0.3.16", default-features = false }

http = "0.2.0"

serde_json = "1.0.0"

tokio = { version = "1.8.4", features = ["full", "test-util"] }

aws/sdk/integration-tests/s3/Cargo.toml

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ aws-types = { path = "../../build/aws-sdk/sdk/aws-types" } 
bytes = "1"

bytes-utils = "0.1.2"

fastrand = "1.8.0"

futures-util = "0.3.25"

futures-util = { version = "0.3.16", default-features = false }

hdrhistogram = "7.5.2"

http = "0.2.3"

http-body = "0.4.5"

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/rustlang/CargoDependency.kt

+5 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ data class CargoDependency( 
    val scope: DependencyScope = DependencyScope.Compile,

    val optional: Boolean = false,

    val features: Set<String> = emptySet(),

    val defaultFeatures: Boolean = true,

    val rustName: String = name.replace("-", "_"),

) : RustDependency(name) {

    val key: Triple<String, DependencyLocation, DependencyScope> get() = Triple(name, location, scope)
@@ -167,6 +168,9 @@ data class CargoDependency( 
        if (optional) {

            attribs["optional"] = true

        }

        if (!defaultFeatures) {

            attribs["default-features"] = false

        }

        return attribs

    }
@@ -220,7 +224,7 @@ data class CargoDependency( 
        val AsyncStream: CargoDependency = CargoDependency("async-stream", CratesIo("0.3.0"), DependencyScope.Dev)

        val Criterion: CargoDependency = CargoDependency("criterion", CratesIo("0.4.0"), DependencyScope.Dev)

        val FuturesCore: CargoDependency = CargoDependency("futures-core", CratesIo("0.3.25"), DependencyScope.Dev)

        val FuturesUtil: CargoDependency = CargoDependency("futures-util", CratesIo("0.3.25"), DependencyScope.Dev)

        val FuturesUtil: CargoDependency = CargoDependency("futures-util", CratesIo("0.3.25"), DependencyScope.Dev, defaultFeatures = false)

        val HdrHistogram: CargoDependency = CargoDependency("hdrhistogram", CratesIo("7.5.2"), DependencyScope.Dev)

        val Hound: CargoDependency = CargoDependency("hound", CratesIo("3.4.0"), DependencyScope.Dev)

        val PrettyAssertions: CargoDependency =