Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,26 @@ jobs:
- name: Lint Client Rust
run: pnpm clients:rust:lint

spellcheck_rust:
name: Spellcheck Rust
runs-on: ubuntu-latest
steps:
- name: Git Checkout
uses: actions/checkout@v4

- name: Install cargo-spellcheck
uses: taiki-e/install-action@v2
with:
tool: cargo-spellcheck

- name: Setup Environment
uses: ./.github/actions/setup
with:
cargo-cache-key: cargo-spellcheck
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: as a convention, the other jobs are using the setup action immediately after the git checkout step. Could we do the same here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, good call, I misunderstood how the cache action works, thanks!


- name: Run cargo-spellcheck
run: pnpm spellcheck:rust

build_programs:
name: Build programs
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ solana = "2.1.0"
[workspace.metadata.toolchains]
format = "nightly-2024-08-08"
lint = "nightly-2024-08-08"

[workspace.metadata.spellcheck]
config = "scripts/spellcheck.toml"
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
"clients:rust:lint": "zx ./scripts/client/lint-rust.mjs",
"clients:rust:publish": "zx ./scripts/client/publish-rust.mjs",
"clients:rust:test": "zx ./scripts/client/test-rust.mjs",
"template:upgrade": "zx ./scripts/upgrade-template.mjs"
"template:upgrade": "zx ./scripts/upgrade-template.mjs",
"spellcheck:rust": "cargo spellcheck --code 1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we call this rust:spellcheck in preparation for febo's work on unifying scripts?

@febo After your refactoring, I think this should be part of the lint subtasks, so it would probably need to be located in scripts/rust/lint-spellcheck. Lmk what you think.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

},
"devDependencies": {
"@codama/renderers-js": "^1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions program/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use {
solana_pubkey::Pubkey,
};

/// Legacy symbols from Memo v1
/// Legacy symbols from Memo version 1
pub mod v1 {
solana_pubkey::declare_id!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo");
}
Expand All @@ -29,7 +29,7 @@ solana_pubkey::declare_id!("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
///
/// Accounts expected by this instruction:
///
/// 0. ..0+N. `[signer]` Expected signers; if zero provided, instruction will
/// 0. `..0+N` `[signer]` Expected signers; if zero provided, instruction will
/// be processed as a normal, unsigned spl-memo
pub fn build_memo(memo: &[u8], signer_pubkeys: &[&Pubkey]) -> Instruction {
Instruction {
Expand Down
51 changes: 51 additions & 0 deletions scripts/solana.dic
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
1000
config
metadata
json
uri
ui
cli
readme/S
arg/S
vec/S
enum/S
noop/S
realloc/S
overallocate/SGD
namespace
serde
deserialize/SRGD
deserialization
struct/S
param/S
tuple/S
metas
infos
async
subcommand
repo
init
solana
sol/S
blockchain/S
permissionless
composability
runtime
onchain
offchain
keypair/S
decrypt/SGD
lamport/S
validator/S
pubkey/S
sysvar/S
timestamp/S
entrypoint/S
spl
pda/S
multisignature/S
multisig/S
staker/S
APY
codama
autogenerated
6 changes: 6 additions & 0 deletions scripts/spellcheck.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[Hunspell]
use_builtin = true
skip_os_lookups = false
search_dirs = ["."]
extra_dictionaries = ["solana.dic"]