Skip to content

Commit 47358ba

Browse files
authored
Merge pull request #630 from madsmtm/update-nightly
Update to nightly 2024-06-13
2 parents 303edaf + 64aa0d5 commit 47358ba

27 files changed

Lines changed: 733 additions & 703 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ env:
5757
# END AUTOMATICALLY GENERATED
5858

5959
# The current nightly Rust version. Keep this synced with `rust-toolchain.toml`
60-
CURRENT_NIGHTLY: nightly-2024-05-01
60+
CURRENT_NIGHTLY: nightly-2024-06-13
6161
# Various features that we'd usually want to test with
6262
#
6363
# Note: The `exception` feature is not enabled here, since it requires

Cargo.lock

Lines changed: 54 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ unreachable_pub = "warn"
1515
unsafe_op_in_unsafe_fn = "deny"
1616

1717
[workspace.lints.clippy]
18-
cargo = "warn"
18+
cargo = { level = "warn", priority = -1 } # Because of `lint_groups_priority`
1919
ptr_as_ptr = "warn"
2020

2121
[profile.assembly-tests]

crates/block2/src/global.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ impl<F: ?Sized> GlobalBlock<F> {
4848
BlockFlags(BlockFlags::BLOCK_IS_GLOBAL.0 | BlockFlags::BLOCK_USE_STRET.0);
4949

5050
#[doc(hidden)]
51+
#[allow(clippy::declare_interior_mutable_const)]
5152
pub const __DEFAULT_HEADER: BlockHeader = BlockHeader {
5253
// Populated in `global_block!`
5354
isa: ptr::null_mut(),

crates/header-translator/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ fn main() -> Result<(), BoxError> {
211211

212212
// Ensure directories exist
213213
let generated_dir = workspace_dir.join("generated").join(library_name);
214-
fs::create_dir_all(&generated_dir)?;
215-
fs::create_dir_all(&crate_dir.join("src"))?;
214+
fs::create_dir_all(generated_dir)?;
215+
fs::create_dir_all(crate_dir.join("src"))?;
216216

217217
// Recreate symlink to generated directory
218218
let symlink_path = crate_dir.join("src").join("generated");

0 commit comments

Comments
 (0)