Remove futures_core::stream::Stream from public API

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/customizations/SmithyTypesPubUseExtra.kt

@@ -26,6 +26,14 @@ private fun hasStreamingOperations(model: Model): Boolean {
     }
 }
 
+/** Returns true if the model has event streaming operations */
+private fun hasEventStreamOperations(model: Model): Boolean =
+    model.operationShapes.any { operation ->
+        val input = model.expectShape(operation.inputShape, StructureShape::class.java)
+        val output = model.expectShape(operation.outputShape, StructureShape::class.java)
+        input.hasEventStreamMember(model) || output.hasEventStreamMember(model)
+    }
+
 // TODO(https://github.com/awslabs/smithy-rs/issues/2111): Fix this logic to consider collection/map shapes
 private fun structUnionMembersMatchPredicate(model: Model, predicate: (Shape) -> Boolean): Boolean =
     model.structureShapes.any { structure ->
@@ -70,4 +78,12 @@ fun pubUseSmithyPrimitives(codegenContext: CodegenContext, model: Model): Writab
             "SdkBody" to RuntimeType.smithyHttp(rc).resolve("body::SdkBody"),
         )
     }
+    if (hasEventStreamOperations(model)) {
+        rustTemplate(
+            """
+            pub use #{FnStream};
+            """,
+            "FnStream" to RuntimeType.smithyAsync(rc).resolve("future::fn_stream::FnStream"),
+        )
+    }
 }

tools/ci-cdk/canary-lambda/src/latest/transcribe_canary.rs

@@ -7,7 +7,6 @@ use crate::canary::CanaryError;
 use crate::mk_canary;
 use aws_config::SdkConfig;
 use aws_sdk_transcribestreaming as transcribe;
-use aws_smithy_async::future::fn_stream::FnStream;
 use bytes::BufMut;
 use transcribe::primitives::Blob;
 use transcribe::types::{
@@ -31,7 +30,7 @@ pub async fn transcribe_canary(
     client: transcribe::Client,
     expected_transcribe_result: String,
 ) -> anyhow::Result<()> {
-    let input_stream = FnStream::new(|tx| {
+    let input_stream = transcribe::primitives::FnStream::new(|tx| {
         Box::pin(async move {
             let pcm = pcm_data();
             for chunk in pcm.chunks(CHUNK_SIZE) {

tools/ci-cdk/canary-runner/src/build_bundle.rs

@@ -56,8 +56,6 @@ tracing-texray = "0.1.1"
 reqwest = { version = "0.11.14", features = ["rustls-tls"], default-features = false }
 "#;
 
-const REQUIRED_SMITHY_CRATES: &[&str] = &["aws-smithy-async"];
-
 const REQUIRED_SDK_CRATES: &[&str] = &[
     "aws-config",
     "aws-sdk-s3",
@@ -131,7 +129,6 @@ fn enabled_feature(crate_source: &CrateSource) -> String {
 
 fn generate_crate_manifest(crate_source: CrateSource) -> Result<String> {
     let mut output = BASE_MANIFEST.to_string();
-    write_dependencies(REQUIRED_SMITHY_CRATES, &mut output, &crate_source)?;
     write_dependencies(REQUIRED_SDK_CRATES, &mut output, &crate_source)?;
     write!(output, "\n[features]\n").unwrap();
     writeln!(output, "latest = []").unwrap();
@@ -438,7 +435,6 @@ uuid = { version = "0.8", features = ["v4"] }
 tokio-stream = "0"
 tracing-texray = "0.1.1"
 reqwest = { version = "0.11.14", features = ["rustls-tls"], default-features = false }
-aws-smithy-async = { path = "some/sdk/path/aws-smithy-async" }
 aws-config = { path = "some/sdk/path/aws-config" }
 aws-sdk-s3 = { path = "some/sdk/path/s3" }
 aws-sdk-ec2 = { path = "some/sdk/path/ec2" }
@@ -503,7 +499,6 @@ uuid = { version = "0.8", features = ["v4"] }
 tokio-stream = "0"
 tracing-texray = "0.1.1"
 reqwest = { version = "0.11.14", features = ["rustls-tls"], default-features = false }
-aws-smithy-async = "0.46.0"
 aws-config = "0.46.0"
 aws-sdk-s3 = "0.20.0"
 aws-sdk-ec2 = "0.19.0"
@@ -520,7 +515,6 @@ default = ["latest"]
                     aws_doc_sdk_examples_revision: "some-revision-docs".into(),
                     manual_interventions: Default::default(),
                     crates: [
-                        crate_version("aws-smithy-async", "0.46.0"),
                         crate_version("aws-config", "0.46.0"),
                         crate_version("aws-sdk-s3", "0.20.0"),
                         crate_version("aws-sdk-ec2", "0.19.0"),