🚨 Ignore naked returns lint errors from new golangci-lint.

globekeeper · Jun 19, 2023 · fbddb04 · fbddb04
1 parent 303a959
commit fbddb04
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/roomserver/internal/perform/perform_peek.go b/roomserver/internal/perform/perform_peek.go
@@ -185,6 +185,7 @@ func (r *Peeker) performPeekRoomByID(
 		content := map[string]string{}
 		if err = json.Unmarshal(ev.Content(), &content); err != nil {
 			util.GetLogger(ctx).WithError(err).Error("json.Unmarshal for history visibility failed")
+			//nolint: nakedret
 			return
 		}
 		if visibility, ok := content["history_visibility"]; ok {
@@ -219,6 +220,7 @@ func (r *Peeker) performPeekRoomByID(
 		},
 	})
 	if err != nil {
+		//nolint: nakedret
 		return
 	}
 

diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
@@ -299,6 +299,7 @@ func (r *messagesReq) retrieveEvents() (
 	streamEvents, err := r.snapshot.GetEventsInTopologicalRange(r.ctx, r.from, r.to, r.roomID, r.filter, r.backwardOrdering)
 	if err != nil {
 		err = fmt.Errorf("GetEventsInRange: %w", err)
+		//nolint: nakedret
 		return
 	}
 
@@ -314,10 +315,12 @@ func (r *messagesReq) retrieveEvents() (
 	// on the ordering), or we've reached a backward extremity.
 	if len(streamEvents) == 0 {
 		if events, err = r.handleEmptyEventsSlice(); err != nil {
+			//nolint: nakedret
 			return
 		}
 	} else {
 		if events, err = r.handleNonEmptyEventsSlice(streamEvents); err != nil {
+			//nolint: nakedret
 			return
 		}
 	}

diff --git a/syncapi/streams/stream_pdu.go b/syncapi/streams/stream_pdu.go
@@ -481,6 +481,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
 
 	stateEvents, err := snapshot.CurrentState(ctx, roomID, stateFilter, excludingEventIDs)
 	if err != nil {
+		//nolint: nakedret
 		return
 	}
 
@@ -534,6 +535,7 @@ func (p *PDUStreamProvider) getJoinResponseForCompleteSync(
 		}
 		backwardTopologyPos, backwardStreamPos, err = snapshot.PositionInTopology(ctx, event.EventID())
 		if err != nil {
+			//nolint: nakedret
 			return
 		}
 		prevBatch = &types.TopologyToken{

diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go
@@ -642,6 +642,7 @@ func (d *Database) CreateDevice(
 		for i := 1; i <= 5; i++ {
 			newDeviceID, returnErr = generateDeviceID()
 			if returnErr != nil {
+				//nolint: nakedret
 				return
 			}
 
@@ -651,6 +652,7 @@ func (d *Database) CreateDevice(
 				return err
 			})
 			if returnErr == nil {
+				//nolint: nakedret
 				return
 			}
 		}