@@ -4414,21 +4414,21 @@ fn parse_attr_list(
44144414 }
44154415
44164416 // ...$name spread — expand define/attribute bundle
4417− if let Some(name) = part.strip_prefix("...$") {
4418− if let Some(define_attrs) = ctx.defines.get(name) {
4419− ctx.used_defines.insert(name.to_string());
4420− attrs.extend(define_attrs.clone());
4421− continue;
4422− }
4417+ if let Some(name) = part.strip_prefix("...$")
4418+ && let Some(define_attrs) = ctx.defines.get(name)
4419+ {
4420+ ctx.used_defines.insert(name.to_string());
4421+ attrs.extend(define_attrs.clone());
4422+ continue;
44234423 }
44244424
44254425 // $define reference — expand attribute bundle
4426− if let Some(name) = part.strip_prefix('$') {
4427− if let Some(define_attrs) = ctx.defines.get(name) {
4428− ctx.used_defines.insert(name.to_string());
4429− attrs.extend(define_attrs.clone());
4430− continue;
4431− }
4426+ if let Some(name) = part.strip_prefix('$')
4427+ && let Some(define_attrs) = ctx.defines.get(name)
4428+ {
4429+ ctx.used_defines.insert(name.to_string());
4430+ attrs.extend(define_attrs.clone());
4431+ continue;
44324432 }
44334433
44344434 // Substitute variables in value
@@ -4837,13 +4837,7 @@ fn evaluate_arithmetic(input: &str) -> String {
48374837 '+' => l + r,
48384838 '-' => l - r,
48394839 '*' => l * r,
4840− '/' => {
4841− if r != 0.0 {
4842− l / r
4843− } else {
4844− return input.to_string();
4845− }
4846− }
4840+ '/' if r != 0.0 => l / r,
48474841 _ => return input.to_string(),
48484842 };
48494843 if result == result.floor() && result.abs() < i64::MAX as f64 {