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 2205455

Browse files
committedApr 10, 2025·
Auto merge of rust-lang#139634 - matthiaskrgr:rollup-45shqa5, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - rust-lang#139502 (fix "still mutable" ice while metrics are enabled) - rust-lang#139510 (Rename some `name` variables as `ident`.) - rust-lang#139606 (Update compiletest to Edition 2024) - rust-lang#139609 (compiletest: don't use stringly paths for `compose_and_run`) - rust-lang#139614 (Avoid empty identifiers for delegate params and args.) - rust-lang#139626 (Remove unnecessary `mut` in test.) - rust-lang#139630 (Miri subtree update) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 69b3959 + c9613f8 commit 2205455

File tree

94 files changed

+2014
-508
lines changed

Some content is hidden

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

94 files changed

+2014
-508
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2312,6 +2312,7 @@ name = "miri"
23122312
version = "0.1.0"
23132313
dependencies = [
23142314
"aes",
2315+
"bitflags",
23152316
"chrono",
23162317
"chrono-tz",
23172318
"colored",

‎compiler/rustc_ast/src/expand/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ pub mod typetree;
1313
#[derive(Debug, Clone, Encodable, Decodable, HashStable_Generic)]
1414
pub struct StrippedCfgItem<ModId = DefId> {
1515
pub parent_module: ModId,
16-
pub name: Ident,
16+
pub ident: Ident,
1717
pub cfg: MetaItem,
1818
}
1919

2020
impl<ModId> StrippedCfgItem<ModId> {
2121
pub fn map_mod_id<New>(self, f: impl FnOnce(ModId) -> New) -> StrippedCfgItem<New> {
22-
StrippedCfgItem { parent_module: f(self.parent_module), name: self.name, cfg: self.cfg }
22+
StrippedCfgItem { parent_module: f(self.parent_module), ident: self.ident, cfg: self.cfg }
2323
}
2424
}

0 commit comments

Comments
 (0)