rebase

annotation/affiliation.go

@@ -62,15 +62,15 @@ func FullTriggerForInterfaceParamFlow(affiliation AffiliationPair, paramNum int)
 			Annotation: &InterfaceParamReachesImplementation{
 				TriggerIfNilable: &TriggerIfNilable{
 					Ann: ParamKeyFromArgNum(affiliation.InterfaceMethod, paramNum)},
-				AffiliationPair: &affiliation,
+				AffiliationPair: affiliation,
 			},
 			Expr: affiliation.interfaceMethodAsExpr(),
 		},
 		Consumer: &ConsumeTrigger{
 			Annotation: &MethodParamFromInterface{
 				TriggerIfNonNil: &TriggerIfNonNil{
 					Ann: ParamKeyFromArgNum(affiliation.ImplementingMethod, paramNum)},
-				AffiliationPair: &affiliation,
+				AffiliationPair: affiliation,
 			},
 			Expr:         affiliation.implementingMethodAsExpr(),
 			Guards:       util.NoGuards(),
@@ -91,15 +91,15 @@ func FullTriggerForInterfaceResultFlow(affiliation AffiliationPair, retNum int)
 			Annotation: &MethodResultReachesInterface{
 				TriggerIfNilable: &TriggerIfNilable{
 					Ann: RetKeyFromRetNum(affiliation.ImplementingMethod, retNum)},
-				AffiliationPair: &affiliation,
+				AffiliationPair: affiliation,
 			},
 			Expr: affiliation.implementingMethodAsExpr(),
 		},
 		Consumer: &ConsumeTrigger{
 			Annotation: &InterfaceResultFromImplementation{
 				TriggerIfNonNil: &TriggerIfNonNil{
 					Ann: RetKeyFromRetNum(affiliation.InterfaceMethod, retNum)},
-				AffiliationPair: &affiliation,
+				AffiliationPair: affiliation,
 			},
 			Expr:         affiliation.interfaceMethodAsExpr(),
 			Guards:       util.NoGuards(),

annotation/copy_test.go

@@ -77,19 +77,19 @@ func getObjInfo(obj any) map[string]objInfo {
 // - number of fields
 // - pointer address (if the field is a struct and has at least one field)
 func (s *CopyTestSuite) TestCopy() {
-	expectedObjs := make(map[string]objInfo)
-	actualObjs := make(map[string]objInfo)
+	var expectedObjs, actualObjs map[string]objInfo
 
 	for _, initStruct := range s.initStructs {
+		var copied any
 		expectedObjs = getObjInfo(initStruct)
 
 		switch t := initStruct.(type) {
 		case ConsumingAnnotationTrigger:
-			tCopied := t.Copy()
-			actualObjs = getObjInfo(tCopied)
+			copied = t.Copy()
+			actualObjs = getObjInfo(copied)
 		case Key:
-			kCopied := t.copy()
-			actualObjs = getObjInfo(kCopied)
+			copied = t.copy()
+			actualObjs = getObjInfo(copied)
 		default:
 			s.Failf("unknown type", "unknown type %T", t)
 		}