From 856ba8a74b48a6b3b32dd86f13b66b61b8579fcd Mon Sep 17 00:00:00 2001
From: Project Nayuki <me@nayuki.io>
Date: Sun, 1 Sep 2024 01:45:03 +0000
Subject: [PATCH] Simplified some unrelated pieces of code.

---
 python/qrcodegen.py | 7 +++----
 rust/src/lib.rs     | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/python/qrcodegen.py b/python/qrcodegen.py
index 3d0a0fc..c0e1902 100644
--- a/python/qrcodegen.py
+++ b/python/qrcodegen.py
@@ -479,12 +479,11 @@ class QrCode:
 		"""Returns an ascending list of positions of alignment patterns for this version number.
 		Each position is in the range [0,177), and are used on both the x and y axes.
 		This could be implemented as lookup table of 40 variable-length lists of integers."""
-		ver: int = self._version
-		if ver == 1:
+		if self._version == 1:
 			return []
 		else:
-			numalign: int = ver // 7 + 2
-			step: int = (ver * 8 + numalign * 3 + 8) // (numalign * 4 - 4) * 2
+			numalign: int = self._version // 7 + 2
+			step: int = (self._version * 8 + numalign * 3 + 8) // (numalign * 4 - 4) * 2
 			result: list[int] = [(self._size - 7 - i * step) for i in range(numalign - 1)] + [6]
 			return list(reversed(result))
 	
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index ad5aecc..92cc3e3 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -413,7 +413,7 @@ impl QrCode {
 		// Calculate error correction code and pack bits
 		let bits: u32 = {
 			// errcorrlvl is uint2, mask is uint3
-			let data: u32 = u32::from(self.errorcorrectionlevel.format_bits() << 3 | mask.value());
+			let data = u32::from(self.errorcorrectionlevel.format_bits() << 3 | mask.value());
 			let mut rem: u32 = data;
 			for _ in 0 .. 10 {
 				rem = (rem << 1) ^ ((rem >> 9) * 0x537);
@@ -696,12 +696,12 @@ impl QrCode {
 	// Each position is in the range [0,177), and are used on both the x and y axes.
 	// This could be implemented as lookup table of 40 variable-length lists of unsigned bytes.
 	fn get_alignment_pattern_positions(&self) -> Vec<i32> {
-		let ver: u8 = self.version.value();
+		let ver = i32::from(self.version.value());
 		if ver == 1 {
 			vec![]
 		} else {
-			let numalign = i32::from(ver) / 7 + 2;
-			let step: i32 = (i32::from(ver) * 8 + numalign * 3 + 5) / (numalign * 4 - 4) * 2;
+			let numalign: i32 = ver / 7 + 2;
+			let step: i32 = (ver * 8 + numalign * 3 + 5) / (numalign * 4 - 4) * 2;
 			let mut result: Vec<i32> = (0 .. numalign-1).map(
 				|i| self.size - 7 - i * step).collect();
 			result.push(6);