Skip to content

Commit 44e5fc4

Browse files
Merge branch 'main' into RFC30/serde-decorator
2 parents 7251962 + 093e9a2 commit 44e5fc4

File tree

43 files changed

+259
-28
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+259
-28
lines changed

.github/workflows/ci-pr.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ jobs:
114114
needs:
115115
- save-docker-login-token
116116
- acquire-base-image
117+
# We need `always` here otherwise this job won't run if the previous job has been skipped
118+
# See https://samanpavel.medium.com/github-actions-conditional-job-execution-e6aa363d2867
119+
if: |
120+
always() &&
121+
!contains(needs.*.result, 'failure') &&
122+
!contains(needs.*.result, 'cancelled')
117123
steps:
118124
- uses: actions/checkout@v3
119125
with:

CHANGELOG.next.toml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,21 @@ message = "Expose local socket address from ConnectionMetadata."
7979
references = ["aws-sdk-rust#990"]
8080
meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "client" }
8181
author = "declanvk"
82+
83+
[[smithy-rs]]
84+
message = "All generated docs now include docsrs labels when features are required"
85+
references = ["smithy-rs#3121", "smithy-rs#3295"]
86+
meta = { "breaking" = false, "tada" = true, "bug" = false, "target" = "all" }
87+
author = "rcoh"
88+
89+
[[aws-sdk-rust]]
90+
message = "All generated docs now include docsrs labels when features are required"
91+
references = ["smithy-rs#3121", "smithy-rs#3295"]
92+
meta = { "breaking" = false, "tada" = true, "bug" = false }
93+
author = "rcoh"
94+
95+
[[smithy-rs]]
96+
message = "[`Number`](https://docs.rs/aws-smithy-types/latest/aws_smithy_types/enum.Number.html) `TryInto` implementations now succesfully convert from `f64` to numeric types when no precision is lost. This fixes some deserialization issues where numbers like `25.0` were sent when `Byte` fields were expected."
97+
references = ["smithy-rs#3294"]
98+
meta = { "breaking" = false, "tada" = false, "bug" = false, "target" = "all" }
99+
author = "rcoh"

aws/rust-runtime/aws-config/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
missing_debug_implementations,
@@ -11,7 +14,6 @@
1114
rustdoc::missing_crate_level_docs,
1215
unreachable_pub
1316
)]
14-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
1517

1618
//! `aws-config` provides implementations of region and credential resolution.
1719
//!

aws/rust-runtime/aws-credential-types/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! `aws-credential-types` provides types concerned with AWS SDK credentials including:
710
//! * Traits for credentials providers and for credentials caching
811
//! * An opaque struct representing credentials

aws/rust-runtime/aws-endpoint/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! This crate is no longer used by the AWS SDK and is deprecated.

aws/rust-runtime/aws-http/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! AWS-specific middleware implementations and HTTP-related features.
710
811
#![allow(clippy::derive_partial_eq_without_eq)]

aws/rust-runtime/aws-hyper/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![deprecated(
710
since = "0.3.0",
811
note = "The functionality of this crate is included in individual AWS services."

aws/rust-runtime/aws-inlineable/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Collection of modules that get conditionally included directly into the code generated
710
//! SDK service crates. For example, when generating S3, the `s3_errors` module will get copied
811
//! into the generated S3 crate to support the code generator.

aws/rust-runtime/aws-runtime-api/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Runtime support code for the AWS SDK. This crate isn't intended to be used directly.
710
811
#![warn(

aws/rust-runtime/aws-runtime/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Runtime support code for the AWS SDK. This crate isn't intended to be used directly.
710
811
#![warn(

aws/rust-runtime/aws-sig-auth/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! This crate is no longer used by the AWS SDK and is deprecated.

aws/rust-runtime/aws-sigv4/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Provides functions for calculating Sigv4 signing keys, signatures, and
710
//! optional utilities for signing HTTP requests and Event Stream messages.
811

aws/rust-runtime/aws-types/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Cross-service types for the AWS SDK.
710
811
#![allow(clippy::derive_partial_eq_without_eq)]

aws/sdk-codegen/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ val smithyVersion: String by project
2323
dependencies {
2424
implementation(project(":codegen-core"))
2525
implementation(project(":codegen-client"))
26-
implementation("org.jsoup:jsoup:1.15.3")
26+
implementation("org.jsoup:jsoup:1.16.2")
2727
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
2828
implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
2929
implementation("software.amazon.smithy:smithy-rules-engine:$smithyVersion")

codegen-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ val smithyVersion: String by project
2323

2424
dependencies {
2525
implementation(kotlin("stdlib-jdk8"))
26-
implementation("org.jsoup:jsoup:1.15.3")
26+
implementation("org.jsoup:jsoup:1.16.2")
2727
api("software.amazon.smithy:smithy-codegen-core:$smithyVersion")
2828
api("com.moandjiezana.toml:toml4j:0.7.2")
2929
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")

codegen-core/src/main/kotlin/software/amazon/smithy/rust/codegen/core/smithy/generators/LibRsGenerator.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import software.amazon.smithy.rust.codegen.core.rustlang.Writable
1212
import software.amazon.smithy.rust.codegen.core.rustlang.containerDocs
1313
import software.amazon.smithy.rust.codegen.core.rustlang.escape
1414
import software.amazon.smithy.rust.codegen.core.rustlang.isNotEmpty
15+
import software.amazon.smithy.rust.codegen.core.rustlang.rawRust
1516
import software.amazon.smithy.rust.codegen.core.rustlang.rust
1617
import software.amazon.smithy.rust.codegen.core.smithy.CoreRustSettings
1718
import software.amazon.smithy.rust.codegen.core.smithy.customize.NamedCustomization
@@ -50,6 +51,7 @@ class LibRsGenerator(
5051
if (requireDocs) {
5152
rust("##![warn(missing_docs)]")
5253
}
54+
rawRust("#![cfg_attr(docsrs, feature(doc_auto_cfg))]")
5355

5456
// Allow for overriding the default service docs via customization
5557
val defaultServiceDocs = settings.getService(model).getTrait<DocumentationTrait>()?.value

rust-runtime/aws-smithy-async/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
missing_docs,

rust-runtime/aws-smithy-checksums/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
// missing_docs,

rust-runtime/aws-smithy-client/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! This crate is no longer used by smithy-rs and is deprecated.
710
811
#![warn(

rust-runtime/aws-smithy-eventstream/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
// missing_docs,

rust-runtime/aws-smithy-http-auth/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![warn(
710
missing_docs,
811
rustdoc::missing_crate_level_docs,

rust-runtime/aws-smithy-http-server-python/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![cfg_attr(docsrs, feature(doc_cfg))]
811

rust-runtime/aws-smithy-http-server-typescript/src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
33
* SPDX-License-Identifier: Apache-2.0
44
*/
5+
6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */

rust-runtime/aws-smithy-http-server/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![cfg_attr(docsrs, feature(doc_cfg))]
811

rust-runtime/aws-smithy-http-tower/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! This crate is no longer used by smithy-rs and is deprecated.
710
811
#![warn(

rust-runtime/aws-smithy-http/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![warn(
710
missing_docs,
811
rustdoc::missing_crate_level_docs,

rust-runtime/aws-smithy-json/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
// missing_docs,

rust-runtime/aws-smithy-protocol-test/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![warn(
710
// missing_docs,
811
// rustdoc::missing_crate_level_docs,

rust-runtime/aws-smithy-query/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![allow(clippy::derive_partial_eq_without_eq)]
710
#![warn(
811
// missing_docs,

rust-runtime/aws-smithy-runtime-api/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
#![warn(
710
missing_docs,
811
rustdoc::missing_crate_level_docs,

rust-runtime/aws-smithy-runtime/src/lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Runtime support logic and types for smithy-rs generated code.
710
//!
811
//! # Crate Features
@@ -17,7 +20,6 @@
1720
unreachable_pub,
1821
rust_2018_idioms
1922
)]
20-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
2123

2224
/// Runtime support logic for generated clients.
2325
#[cfg(feature = "client")]

rust-runtime/aws-smithy-types-convert/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Conversions between `aws-smithy-types` and the types of frequently used Rust libraries.
710
811
#![allow(clippy::derive_partial_eq_without_eq)]

rust-runtime/aws-smithy-types/src/lib.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* SPDX-License-Identifier: Apache-2.0
44
*/
55

6+
/* Automatically managed default lints */
7+
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
8+
/* End of automatically managed default lints */
69
//! Protocol-agnostic types for smithy-rs.
710
811
#![allow(clippy::derive_partial_eq_without_eq)]
@@ -13,7 +16,7 @@
1316
rust_2018_idioms,
1417
unreachable_pub
1518
)]
16-
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
19+
1720
pub mod base64;
1821
pub mod body;
1922
pub mod byte_stream;

0 commit comments

Comments
 (0)