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 7c83a70

Browse files
committedJan 5, 2024
Auto merge of rust-lang#119609 - matthiaskrgr:rollup-zg85wqn, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#118680 (Add support for shell argfiles) - rust-lang#119216 (Use diagnostic namespace in stdlib) - rust-lang#119350 (Imply outlives-bounds on lazy type aliases) - rust-lang#119538 (Cleanup error handlers: round 5) - rust-lang#119563 (Check yield terminator's resume type in borrowck) - rust-lang#119577 (Migrate memory overlap check from validator to lint) - rust-lang#119589 (cstore: Remove unnecessary locking from `CrateMetadata`) Failed merges: - rust-lang#119591 (rustc_mir_transform: Make DestinationPropagation stable for queries) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8d39ec1 + 6880711 commit 7c83a70

File tree

120 files changed

+1177
-970
lines changed

Some content is hidden

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

120 files changed

+1177
-970
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3738,6 +3738,7 @@ dependencies = [
37383738
"rustc_trait_selection",
37393739
"rustc_ty_utils",
37403740
"serde_json",
3741+
"shlex",
37413742
"time",
37423743
"tracing",
37433744
"windows",

‎compiler/rustc_ast_passes/src/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -725,8 +725,8 @@ impl AddToDiagnostic for StableFeature {
725725
rustc_errors::SubdiagnosticMessage,
726726
) -> rustc_errors::SubdiagnosticMessage,
727727
{
728-
diag.set_arg("name", self.name);
729-
diag.set_arg("since", self.since);
728+
diag.arg("name", self.name);
729+
diag.arg("since", self.since);
730730
diag.help(fluent::ast_passes_stable_since);
731731
}
732732
}

0 commit comments

Comments
 (0)
This repository has been archived.