Skip to content

Commit e379976

Browse files
sethvargosethvargo
authored
Update wordlists (#14)
1 parent efcc200 commit e379976

14 files changed

+9
-204
lines changed

‎.github/workflows/test.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: Test
33
on:
44
push:
55
branches:
6-
- main
6+
- 'main'
77
pull_request:
88
branches:
9-
- main
9+
- 'main'
1010

1111
concurrency:
1212
group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
@@ -25,9 +25,9 @@ jobs:
2525
runs-on: '${{ matrix.platform }}'
2626

2727
steps:
28-
- uses: 'actions/checkout@v4'
28+
- uses: 'actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683' # ratchet:actions/checkout@v4
2929

30-
- uses: 'actions/setup-go@v5'
30+
- uses: 'actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34' # ratchet:actions/setup-go@v5
3131
with:
3232
go-version-file: 'go.mod'
3333

‎cmd/diceware/main.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package main
152

163
import (

‎diceware/diceware_doc_test.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware_test
152

163
import (

‎diceware/generate.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
import (

‎diceware/generate_test.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
import (

‎diceware/interface.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
type DicewareGenerator interface {

‎diceware/mock.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
var _ DicewareGenerator = (*mockGenerator)(nil)

‎diceware/word_list.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
// WordList is an interface that must be implemented to be considered a word

‎diceware/word_list_eff_large.go

+4-17
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
import "sync"
@@ -2034,7 +2021,7 @@ var WordListEffLarge = sync.OnceValue(func() WordList {
20342021
24252: "drone",
20352022
24253: "drool",
20362023
24254: "droop",
2037-
24255: "dropdown",
2024+
24255: "drop-down",
20382025
24256: "dropbox",
20392026
24261: "dropkick",
20402027
24262: "droplet",
@@ -2553,7 +2540,7 @@ var WordListEffLarge = sync.OnceValue(func() WordList {
25532540
26515: "feel",
25542541
26516: "feisty",
25552542
26521: "feline",
2556-
26522: "felttip",
2543+
26522: "felt-tip",
25572544
26523: "feminine",
25582545
26524: "feminism",
25592546
26525: "feminist",
@@ -6665,7 +6652,7 @@ var WordListEffLarge = sync.OnceValue(func() WordList {
66656652
61531: "synthetic",
66666653
61532: "syrup",
66676654
61533: "system",
6668-
61534: "tshirt",
6655+
61534: "t-shirt",
66696656
61535: "tabasco",
66706657
61536: "tabby",
66716658
61541: "tableful",
@@ -7773,7 +7760,7 @@ var WordListEffLarge = sync.OnceValue(func() WordList {
77737760
66615: "yield",
77747761
66616: "yin",
77757762
66621: "yippee",
7776-
66622: "yoyo",
7763+
66622: "yo-yo",
77777764
66623: "yodel",
77787765
66624: "yoga",
77797766
66625: "yogurt",

‎diceware/word_list_eff_small.go

-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
import "sync"

‎diceware/word_list_original.go

+1-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
// Copyright \d{4} .*
2-
//
3-
// Licensed under the Apache License, Version 2.0 (the "License");
4-
// you may not use this file except in compliance with the License.
5-
// You may obtain a copy of the License at
6-
//
7-
// [\t\f]+|[ ]{2,}http://www.apache.org/licenses/LICENSE-2.0
8-
//
9-
// Unless required by applicable law or agreed to in writing, software
10-
// distributed under the License is distributed on an "AS IS" BASIS,
11-
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12-
// See the License for the specific language governing permissions and
13-
// limitations under the License.
141
package diceware
152

163
import "sync"
@@ -1758,7 +1745,7 @@ var WordListOriginal = sync.OnceValue(func() WordList {
17581745
23121: "diem",
17591746
23122: "diesel",
17601747
23123: "diet",
1761-
23124: "deity",
1748+
23124: "diety",
17621749
23125: "dietz",
17631750
23126: "dig",
17641751
23131: "digit",

‎tools/go.mod

-10
This file was deleted.

‎tools/go.sum

-45
This file was deleted.

‎tools/tools.go

-10
This file was deleted.

0 commit comments

Comments
 (0)