From f56914cea912bc09bcb2fb3dcd4799e4841dc440 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 23 Apr 2024 11:11:09 -0700 Subject: [PATCH] [core] Rename `LockRankSet::name` to `member_name`. --- wgpu-core/src/lock/rank.rs | 2 +- wgpu-core/src/lock/ranked.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/wgpu-core/src/lock/rank.rs b/wgpu-core/src/lock/rank.rs index 162d3d260..cfb93116d 100644 --- a/wgpu-core/src/lock/rank.rs +++ b/wgpu-core/src/lock/rank.rs @@ -63,7 +63,7 @@ macro_rules! define_lock_ranks { } impl LockRankSet { - pub fn name(self) -> &'static str { + pub fn member_name(self) -> &'static str { match self { $( LockRankSet:: $name => $member, diff --git a/wgpu-core/src/lock/ranked.rs b/wgpu-core/src/lock/ranked.rs index 13301f86f..89805cb18 100644 --- a/wgpu-core/src/lock/ranked.rs +++ b/wgpu-core/src/lock/ranked.rs @@ -144,12 +144,12 @@ fn acquire(new_rank: LockRank, location: &'static Location<'static>) -> LockStat last locked {:<35} at {}\n\ now locking {:<35} at {}\n\ Locking {} after locking {} is not permitted.", - last_rank.bit.name(), + last_rank.bit.member_name(), last_location, - new_rank.bit.name(), + new_rank.bit.member_name(), location, - new_rank.bit.name(), - last_rank.bit.name(), + new_rank.bit.member_name(), + last_rank.bit.member_name(), ); } LOCK_STATE.set(LockState {