Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 86ce982

Browse files
committedAug 18, 2024·
Auto merge of rust-lang#129254 - matthiaskrgr:rollup-qm30weo, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#125854 (Move ZST ABI handling to `rustc_target`) - rust-lang#127623 (fix: fs::remove_dir_all: treat internal ENOENT as success) - rust-lang#128084 (Suggest adding Result return type for associated method in E0277.) - rust-lang#128902 (doc: std::env::var: Returns None for names with '=' or NUL byte) - rust-lang#129187 (bootstrap: fix clean's remove_dir_all implementation) - rust-lang#129235 (Check that `#[may_dangle]` is properly applied) - rust-lang#129245 (Typo) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6de928d + d0638a1 commit 86ce982

Some content is hidden

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

41 files changed

+1181
-179
lines changed
 

‎compiler/rustc_hir/src/hir.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ pub struct LetExpr<'hir> {
13951395
pub pat: &'hir Pat<'hir>,
13961396
pub ty: Option<&'hir Ty<'hir>>,
13971397
pub init: &'hir Expr<'hir>,
1398-
/// `Recovered::Yes` when this let expressions is not in a syntanctically valid location.
1398+
/// `Recovered::Yes` when this let expressions is not in a syntactically valid location.
13991399
/// Used to prevent building MIR in such situations.
14001400
pub recovered: ast::Recovered,
14011401
}

‎compiler/rustc_passes/messages.ftl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,9 @@ passes_macro_export_on_decl_macro =
444444
passes_macro_use =
445445
`#[{$name}]` only has an effect on `extern crate` and modules
446446
447+
passes_may_dangle =
448+
`#[may_dangle]` must be applied to a lifetime or type generic parameter in `Drop` impl
449+
447450
passes_maybe_string_interpolation = you might have meant to use string interpolation in this string literal
448451
passes_missing_const_err =
449452
attributes `#[rustc_const_unstable]` and `#[rustc_const_stable]` require the function or method to be `const`
@@ -475,8 +478,8 @@ passes_multiple_start_functions =
475478
.previous = previous `#[start]` function here
476479
477480
passes_must_not_suspend =
478-
`must_not_suspend` attribute should be applied to a struct, enum, or trait
479-
.label = is not a struct, enum, or trait
481+
`must_not_suspend` attribute should be applied to a struct, enum, union, or trait
482+
.label = is not a struct, enum, union, or trait
480483
481484
passes_must_use_async =
482485
`must_use` attribute on `async` functions applies to the anonymous `Future` returned by the function, not the value within

0 commit comments

Comments
 (0)
This repository has been archived.