From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 897A01F4631 for ; Sun, 31 Aug 2025 09:54:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756634092; cv=none; b=kYypiarMXBIf2wkKfZegFxsS26PGfa4dUSmAHM2XhURlqedtPRqTTLNhqf5jfpJHXMM1NWHjgPF+MzKqHmkMxqTayb895G8jNJSP+EPIX4PAJ22lZ2ZOu5bgfvnRaEoOlYku8AD03kNtx64jUEemFh37q98jV3XtLS31P+INk8E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756634092; c=relaxed/simple; bh=+3FyM1QmRpgKc5DDE+IPLwNagEEDwhjTjHWJorrZ9DM=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FDyUCjyYhoTICdeV+lqt/MN7UQTsOFaAMU7sUKdhPBjnJHczCUn0KXNgPsDKWmni9vqBFY+18OHeGN5781sOYiAUB7SI+9CQm8cUTES0hAWg55CI4/S1gyn7KxI++4JIdj3vaTtAtrt3FJDbSZDlIwvvm6tI0jaHQ7tsb3S0mqY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eTOGvNr4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eTOGvNr4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8252FC4CEED; Sun, 31 Aug 2025 09:54:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756634092; bh=+3FyM1QmRpgKc5DDE+IPLwNagEEDwhjTjHWJorrZ9DM=; h=From:To:Cc:Subject:Date:From; b=eTOGvNr420dwWNve+SzKHq8znkWS0IqmKJuVd8iJ5DzP1ONZw0o27cPgrP47kQpz5 wc7RP5B6ENl0CfYwr8zKTBG5ktMaJ4WKm35nW1P+0tIVQ0A3zlbTZEGtxRvjGFnzDl ecZ7oFsdefIMLvNUd+HWsasC/h0vM+urmKaOaK2WtxXLmDF5UAVjeKujRlc11dB6GV NckbmzVTa13+m79v41ZanOqiY6LX34qzRYgjS7OT/WJ+uXPJJatQkVscuQqFruYsjn sfDDpa5lZ22H7jlPI4fOq2Tvanp3BzfO9B1IZATn+Jr2MQmDzQXOQGItdGdeI6ybxR D0PI2H8U5tfsw== From: Jarkko Sakkinen To: tpm-protocol@lists.linux.dev Cc: Jarkko Sakkinen Subject: [PATCH] refactor!(TpmRc): remove unnecessary Result wrapper Date: Sun, 31 Aug 2025 12:54:44 +0300 Message-Id: <20250831095444.54784-1-jarkko@kernel.org> X-Mailer: git-send-email 2.39.5 Precedence: bulk X-Mailing-List: tpm-protocol@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit `Result` wrapper in the return value of `TpmRc::base()` exists only to retain API backwards compatibility in 0.10.x branch. Remove the wrapper in the main branch. Signed-off-by: Jarkko Sakkinen --- src/data/tpm_rc.rs | 20 +++++++------------- tests/runner.rs | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/data/tpm_rc.rs b/src/data/tpm_rc.rs index c7fa71a..fa8756f 100644 --- a/src/data/tpm_rc.rs +++ b/src/data/tpm_rc.rs @@ -165,12 +165,9 @@ pub struct TpmRc { impl TpmRc { /// Returns the base error code, with handle, parameter, or session index /// stripped out. - /// - /// # Errors - /// - /// This method returns a `Result` in order to retain API compatibility. - pub fn base(self) -> Result { - Ok(self.base) + #[must_use] + pub fn base(self) -> TpmRcBase { + self.base } #[must_use] @@ -250,14 +247,11 @@ impl From for TpmRc { impl Display for TpmRc { fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result { - if let Ok(base) = self.base() { - if let Some(index) = self.index() { - write!(f, "[{base}, {index}]") - } else { - write!(f, "{base}") - } + let base = self.base(); + if let Some(index) = self.index() { + write!(f, "[{base}, {index}]") } else { - write!(f, "TPM_RC_UNKNOWN(0x{:08X})", self.value()) + write!(f, "{base}") } } } diff --git a/tests/runner.rs b/tests/runner.rs index 83fc209..218d813 100644 --- a/tests/runner.rs +++ b/tests/runner.rs @@ -239,7 +239,7 @@ fn test_tpm_rc_base_from_raw() { for (description, raw_rc, expected_base) in cases { let rc = TpmRc::try_from(raw_rc).unwrap(); - assert_eq!(rc.base(), Ok(expected_base), "{description}"); + assert_eq!(rc.base(), expected_base, "{description}"); } } -- 2.39.5