make linter happy

Author: Liam Cervante

internal/stacks/stackruntime/internal/stackeval/stack.go

@@ -764,24 +764,22 @@ Instance:
 			}
 		}
 
-		if removeds != nil {
-			for _, removed := range removeds {
-				insts, unknown, _ := removed.Instances(ctx, PlanPhase)
-				if unknown {
-					// We can't determine if the component is targeted or not. This
-					// is okay, as any changes to this component will be deferred
-					// anyway and a follow up plan will then detect the missing
-					// component if it exists.
-					continue Instance
-				}
+		for _, removed := range removeds {
+			insts, unknown, _ := removed.Instances(ctx, PlanPhase)
+			if unknown {
+				// We can't determine if the component is targeted or not. This
+				// is okay, as any changes to this component will be deferred
+				// anyway and a follow up plan will then detect the missing
+				// component if it exists.
+				continue Instance
+			}
 
-				for _, i := range insts {
-					// the instance key for a removed block doesn't always translate
-					// directly into the instance key in the address, so we have
-					// to check for the correct one.
-					if i.from.Item.Key == inst.Item.Key {
-						continue Instance
-					}
+			for _, i := range insts {
+				// the instance key for a removed block doesn't always translate
+				// directly into the instance key in the address, so we have
+				// to check for the correct one.
+				if i.from.Item.Key == inst.Item.Key {
+					continue Instance
 				}
 			}
 		}

internal/stacks/stackruntime/internal/stackeval/walk_dynamic.go

@@ -144,20 +144,18 @@ func walkDynamicObjectsInStack[Output any](
 
 				claimedInstances := collections.NewSet[stackaddrs.ComponentInstance]()
 				removed := stack.Removed(ctx, component.Addr().Item)
-				if removed != nil {
-					for _, block := range removed {
-						// In this case we don't care about the unknown. If the
-						// removed instances are unknown, then we'll mark
-						// everything as being part of the component block. So,
-						// even if insts comes back as unknown and hence empty,
-						// we still proceed as normal.
-						insts, _, _ := block.Instances(ctx, phase)
-						for key := range insts {
-							claimedInstances.Add(stackaddrs.ComponentInstance{
-								Component: component.Addr().Item,
-								Key:       key,
-							})
-						}
+				for _, block := range removed {
+					// In this case we don't care about the unknown. If the
+					// removed instances are unknown, then we'll mark
+					// everything as being part of the component block. So,
+					// even if insts comes back as unknown and hence empty,
+					// we still proceed as normal.
+					insts, _, _ := block.Instances(ctx, phase)
+					for key := range insts {
+						claimedInstances.Add(stackaddrs.ComponentInstance{
+							Component: component.Addr().Item,
+							Key:       key,
+						})
 					}
 				}
 
@@ -297,6 +295,7 @@ func walkDynamicObjectsInStack[Output any](
 					if componentInstances.Has(inst.Addr().Item) {
 						// this is an error, but it should have been raised
 						// elsewhere
+						continue
 					}
 					claimedInstances.Add(inst.Addr().Item)
 					mutex.Unlock()