Skip to content

Commit ff698b1

Browse files
authored
Merge branch 'main' into ci-use-github-hosted-macos-runners
2 parents 17ac389 + 6c78c30 commit ff698b1

File tree

59 files changed

+731
-480
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+731
-480
lines changed

.clippy.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,4 @@ disallowed-types = [
2020
{ path = "std::string::String", reason = "Use `vite_str::Str` for small strings. For large strings, prefer `Box/Rc/Arc<str>` if mutation is not needed." },
2121
]
2222

23-
disallowed-macros = [
24-
{ path = "std::format", reason = "Use `vite_str::format` for small strings." },
25-
]
23+
disallowed-macros = [{ path = "std::format", reason = "Use `vite_str::format` for small strings." }]

.devcontainer/devcontainer.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
},
1717
"customizations": {
1818
"vscode": {
19-
"extensions": [
20-
"rust-lang.rust-analyzer",
21-
"tamasfe.even-better-toml",
22-
"fill-labs.dependi"
23-
],
19+
"extensions": ["rust-lang.rust-analyzer", "tamasfe.even-better-toml", "fill-labs.dependi"],
2420
"settings": {
2521
"terminal.integrated.defaultProfile.linux": "fish",
2622
"terminal.integrated.profiles.linux": {

.github/renovate.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": ["github>Boshen/renovate", "helpers:pinGitHubActionDigestsToSemver"]
3+
"extends": ["github>Boshen/renovate"]
44
}

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,11 @@ jobs:
120120
with:
121121
save-cache: ${{ github.ref_name == 'main' }}
122122
cache-key: fmt
123-
tools: dprint,cargo-shear
123+
tools: cargo-shear
124124
components: clippy rust-docs rustfmt
125125

126-
- run: dprint check
126+
- uses: oxc-project/setup-node@fdbf0dfd334c4e6d56ceeb77d91c76339c2a0885 # v1.0.4
127+
- run: pnpm oxfmt --check
127128
- run: cargo shear
128129
- run: cargo fmt --check
129130
- run: RUSTDOCFLAGS='-D warnings' cargo doc --no-deps --document-private-items
@@ -132,8 +133,6 @@ jobs:
132133
with:
133134
files: .
134135

135-
- uses: oxc-project/setup-node@fdbf0dfd334c4e6d56ceeb77d91c76339c2a0885 # v1.0.4
136-
137136
- name: Deduplicate dependencies
138137
run: pnpm dedupe --check
139138

.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

.oxfmtrc.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"singleQuote": true,
3+
"ignorePatterns": ["crates/fspy_detours_sys/detours", "crates/vite_task_graph/run-config.ts"]
4+
}

.rustfmt.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,4 @@ group_imports = "StdExternalCrate"
1818
imports_granularity = "Crate"
1919

2020
# Skip generated files
21-
ignore = [
22-
"crates/fspy_detours_sys/src/generated_bindings.rs",
23-
]
21+
ignore = ["crates/fspy_detours_sys/src/generated_bindings.rs"]

CLAUDE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ A monorepo task runner (like Nx/Turbo) with intelligent caching and dependency r
2727
```bash
2828
just init # Install build tools and dependencies
2929
just ready # Full quality check (fmt, check, test, lint, doc)
30-
just fmt # Format code (cargo fmt, cargo shear, dprint)
30+
just fmt # Format code (cargo fmt, cargo shear, oxfmt)
3131
just check # Check compilation with all features
3232
just test # Run all tests
3333
just lint # Clippy linting

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
just init
1515
```
1616

17-
This installs all required Rust tools (`cargo-insta`, `typos-cli`, `cargo-shear`, `dprint`, `taplo-cli`) and bootstraps the Node.js tooling.
17+
This installs all required Rust tools (`cargo-insta`, `typos-cli`, `cargo-shear`, `taplo-cli`) and bootstraps the Node.js tooling.
1818

1919
## Development Workflow
2020

@@ -29,7 +29,7 @@ Officially, Vite Task is distributed as part of Vite+ and invoked via `vp run`.
2929

3030
```bash
3131
just ready # Full quality check: typos, fmt, check, test, lint, doc
32-
just fmt # Format code (cargo fmt + cargo shear + dprint)
32+
just fmt # Format code (cargo fmt + cargo shear + oxfmt)
3333
just check # Check compilation with all features
3434
just test # Run all tests
3535
just lint # Clippy linting

crates/fspy_detours_sys/Cargo.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ rust-version.workspace = true
1010
cc = { workspace = true }
1111

1212
[dependencies]
13-
winapi = { workspace = true, features = ["minwindef", "libloaderapi", "processthreadsapi", "windef"] }
13+
winapi = { workspace = true, features = [
14+
"minwindef",
15+
"libloaderapi",
16+
"processthreadsapi",
17+
"windef",
18+
] }
1419

1520
[lints]
1621
workspace = true

0 commit comments

Comments
 (0)