Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

all: Fix nested `if` with `else if` (#8467) 

Co-authored-by: deepsource-autofix[bot] <62050782+deepsource-autofix[bot]@users.noreply.github.com>
This commit is contained in:
deepsource-autofix[bot] 2022-07-28 19:14:22 +02:00 committed by GitHub
parent dde275c6cc
commit f2be9d1166
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/discover/global_test.go
View File

@ -142,10 +142,8 @@ func TestGlobalOverHTTPS(t *testing.T) {
url = "https://" + list.Addr().String() + "?insecure"
if addresses, err := testLookup(url); err != nil {
t.Fatalf("unexpected error: %v", err)
} else {
if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
t.Errorf("incorrect addresses list: %+v", addresses)
}
} else if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
t.Errorf("incorrect addresses list: %+v", addresses)
}
// With "id" set to something incorrect, the checks should fail again.
@ -162,10 +160,8 @@ func TestGlobalOverHTTPS(t *testing.T) {
url = "https://" + list.Addr().String() + "?id=" + id.String()
if addresses, err := testLookup(url); err != nil {
t.Fatalf("unexpected error: %v", err)
} else {
if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
t.Errorf("incorrect addresses list: %+v", addresses)
}
} else if len(addresses) != 1 || addresses[0] != "tcp://192.0.2.42::22000" {
t.Errorf("incorrect addresses list: %+v", addresses)
}
}

6
lib/ignore/ignore.go
View File

@ -289,10 +289,8 @@ func (m *Matcher) Match(file string) (result Result) {
if pattern.match.Match(lowercaseFile) {
return pattern.result
}
} else {
if pattern.match.Match(file) {
return pattern.result
}
} else if pattern.match.Match(file) {
return pattern.result
}
}