Skip to content

Commit

Permalink
Update nightly for api-diff (#441)
Browse files Browse the repository at this point in the history
* Update nightly for api-diff

* Satisfy the clippy
  • Loading branch information
justsmth authored Jun 11, 2024
1 parent c4d2162 commit ee99f03
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:
RUST_BACKTRACE: 1
# We can pin the version if nightly is too unstable.
# Otherwise, we test against the latest version.
RUST_NIGHTLY_TOOLCHAIN: nightly-2024-05-22
RUST_NIGHTLY_TOOLCHAIN: nightly-2024-06-07
# Mirai version tag, updates this whenever a new version
# is released.
MIRAI_TOOLCHAIN: nightly-2023-05-09
Expand Down
13 changes: 7 additions & 6 deletions aws-lc-fips-sys/builder/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,24 @@ impl ParseCallbacks for StripPrefixCallback {

const PRELUDE: &str = r"
#![allow(
unused_imports,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
improper_ctypes,
clippy::cast_lossless,
clippy::cast_possible_truncation,
clippy::default_trait_access,
clippy::must_use_candidate,
clippy::not_unsafe_ptr_arg_deref,
clippy::ptr_as_ptr,
clippy::pub_underscore_fields
clippy::semicolon_if_nothing_returned,
clippy::too_many_lines,
clippy::unreadable_literal,
clippy::used_underscore_binding,
clippy::useless_transmute,
clippy::pub_underscore_fields
dead_code,
improper_ctypes,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
unused_imports,
)]
";

Expand Down
13 changes: 7 additions & 6 deletions aws-lc-fips-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,23 +40,24 @@ platform_binding!(aarch64_apple_darwin);

#[cfg(use_bindgen_generated)]
#[allow(
unused_imports,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
improper_ctypes,
clippy::cast_lossless,
clippy::cast_possible_truncation,
clippy::default_trait_access,
clippy::must_use_candidate,
clippy::not_unsafe_ptr_arg_deref,
clippy::ptr_as_ptr,
clippy::pub_underscore_fields,
clippy::semicolon_if_nothing_returned,
clippy::too_many_lines,
clippy::unreadable_literal,
clippy::used_underscore_binding,
clippy::useless_transmute,
clippy::pub_underscore_fields
dead_code,
improper_ctypes,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
unused_imports
)]
mod generated {
include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
Expand Down
4 changes: 2 additions & 2 deletions aws-lc-rs/src/aead/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ impl TlsRecordSealingKey {
///
/// # Errors
/// * `Unspecified`: Returned if the length of `key_bytes` does not match the chosen algorithm,
/// or if an unsupported algorithm is provided.
/// or if an unsupported algorithm is provided.
pub fn new(
algorithm: &'static Algorithm,
protocol: TlsProtocolId,
Expand Down Expand Up @@ -191,7 +191,7 @@ impl TlsRecordOpeningKey {
///
/// # Errors
/// * `Unspecified`: Returned if the length of `key_bytes` does not match the chosen algorithm,
/// or if an unsupported algorithm is provided.
/// or if an unsupported algorithm is provided.
pub fn new(
algorithm: &'static Algorithm,
protocol: TlsProtocolId,
Expand Down
8 changes: 4 additions & 4 deletions aws-lc-rs/src/cipher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ impl UnboundCipherKey {
/// # Errors
///
/// * [`Unspecified`] if `key_bytes.len()` does not match the
/// length required by `algorithm`.
/// length required by `algorithm`.
pub fn new(algorithm: &'static Algorithm, key_bytes: &[u8]) -> Result<Self, Unspecified> {
let key_bytes = Buffer::new(key_bytes.to_vec());
Ok(UnboundCipherKey {
Expand Down Expand Up @@ -432,7 +432,7 @@ impl EncryptingKey {
///
/// # Errors
/// * [`Unspecified`]: Returned if cipher mode requires input to be a multiple of the block length,
/// and `in_out.len()` is not. Otherwise, returned if encryption fails.
/// and `in_out.len()` is not. Otherwise, returned if encryption fails.
pub fn encrypt(&self, in_out: &mut [u8]) -> Result<DecryptionContext, Unspecified> {
let context = self.algorithm.new_encryption_context(self.mode)?;
self.less_safe_encrypt(in_out, context)
Expand All @@ -443,7 +443,7 @@ impl EncryptingKey {
///
/// # Errors
/// * [`Unspecified`]: Returned if cipher mode requires input to be a multiple of the block length,
/// and `in_out.len()` is not. Otherwise returned if encryption fails.
/// and `in_out.len()` is not. Otherwise returned if encryption fails.
pub fn less_safe_encrypt(
&self,
in_out: &mut [u8],
Expand Down Expand Up @@ -517,7 +517,7 @@ impl DecryptingKey {
///
/// # Errors
/// * [`Unspecified`]: Returned if cipher mode requires input to be a multiple of the block length,
/// and `in_out.len()` is not. Also returned if decryption fails.
/// and `in_out.len()` is not. Also returned if decryption fails.
pub fn decrypt<'in_out>(
&self,
in_out: &'in_out mut [u8],
Expand Down
8 changes: 4 additions & 4 deletions aws-lc-rs/src/key_wrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ impl KeyWrap for KeyEncryptionKey<AesBlockCipher> {
///
/// # Errors
/// * [`Unspecified`]: An error occurred either due to `output` being insufficiently sized, `input` exceeding
/// the allowed input size, or for other unspecified reasons.
/// the allowed input size, or for other unspecified reasons.
fn wrap<'output>(
self,
plaintext: &[u8],
Expand Down Expand Up @@ -259,7 +259,7 @@ impl KeyWrap for KeyEncryptionKey<AesBlockCipher> {
///
/// # Errors
/// * [`Unspecified`]: An error occurred either due to `output` being insufficiently sized, `input` exceeding
/// the allowed input size, or for other unspecified reasons.
/// the allowed input size, or for other unspecified reasons.
fn unwrap<'output>(
self,
ciphertext: &[u8],
Expand Down Expand Up @@ -318,7 +318,7 @@ impl KeyWrapPadded for KeyEncryptionKey<AesBlockCipher> {
///
/// # Errors
/// * [`Unspecified`]: An error occurred either due to `output` being insufficiently sized, `input` exceeding
/// the allowed input size, or for other unspecified reasons.
/// the allowed input size, or for other unspecified reasons.
fn wrap_with_padding<'output>(
self,
plaintext: &[u8],
Expand Down Expand Up @@ -364,7 +364,7 @@ impl KeyWrapPadded for KeyEncryptionKey<AesBlockCipher> {
///
/// # Errors
/// * [`Unspecified`]: An error occurred either due to `output` being insufficiently sized, `input` exceeding
/// the allowed input size, or for other unspecified reasons.
/// the allowed input size, or for other unspecified reasons.
fn unwrap_with_padding<'output>(
self,
ciphertext: &[u8],
Expand Down
13 changes: 7 additions & 6 deletions aws-lc-sys/builder/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,23 +33,24 @@ impl ParseCallbacks for StripPrefixCallback {

const PRELUDE: &str = r"
#![allow(
unused_imports,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
improper_ctypes,
clippy::cast_lossless,
clippy::cast_possible_truncation,
clippy::default_trait_access,
clippy::must_use_candidate,
clippy::not_unsafe_ptr_arg_deref,
clippy::ptr_as_ptr,
clippy::pub_underscore_fields
clippy::semicolon_if_nothing_returned,
clippy::too_many_lines,
clippy::unreadable_literal,
clippy::used_underscore_binding,
clippy::useless_transmute,
clippy::pub_underscore_fields
dead_code,
improper_ctypes,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
unused_imports,
)]
";

Expand Down
13 changes: 7 additions & 6 deletions aws-lc-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,24 @@ platform_binding!(aarch64_apple_darwin);

#[cfg(use_bindgen_generated)]
#[allow(
unused_imports,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
improper_ctypes,
clippy::cast_lossless,
clippy::cast_possible_truncation,
clippy::default_trait_access,
clippy::must_use_candidate,
clippy::not_unsafe_ptr_arg_deref,
clippy::ptr_as_ptr,
clippy::pub_underscore_fields,
clippy::semicolon_if_nothing_returned,
clippy::too_many_lines,
clippy::unreadable_literal,
clippy::used_underscore_binding,
clippy::useless_transmute,
clippy::pub_underscore_fields
dead_code,
improper_ctypes,
non_camel_case_types,
non_snake_case,
non_upper_case_globals,
unused_imports
)]
mod generated {

Expand Down

0 comments on commit ee99f03

Please sign in to comment.