Skip to content

Commit 0a911dc

Browse files
authored
feat!: Rust Edition 2024 (#402)
1 parent 598b44c commit 0a911dc

File tree

16 files changed

+295
-279
lines changed

16 files changed

+295
-279
lines changed

.rustfmt.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1+
style_edition = "2024"
2+
13
# Make Rust more readable given most people have wide screens nowadays.
24
# This is also the setting used by [rustc](https://github.com/rust-lang/rust/blob/master/rustfmt.toml)
35
use_small_heuristics = "Max"
46

57
# Use field initialize shorthand if possible
68
use_field_init_shorthand = true
79

10+
reorder_modules = true
11+
812
# For `cargo +nightly fmt`
913
# unstable_features = true
1014
# style_edition = '2024'

Cargo.lock

Lines changed: 32 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ name = "oxc_resolver"
77
version = "4.2.0"
88
authors = ["Boshen <[email protected]>"]
99
categories = ["development-tools"]
10-
edition = "2021"
10+
edition = "2024"
1111
homepage = "https://github.com/oxc-project/oxc-resolver"
1212
include = ["/src", "/examples", "/benches"]
1313
keywords = ["node", "resolve", "cjs", "esm", "enhanced-resolve"]
1414
license = "MIT"
1515
readme = "README.md"
1616
repository = "https://github.com/oxc-project/oxc-resolver"
17-
rust-version = "1.74"
17+
rust-version = "1.85.0"
1818
description = "ESM / CJS module resolution"
1919

2020
[lib]

benches/resolver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::{
44
path::{Path, PathBuf},
55
};
66

7-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
7+
use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
88
use rayon::prelude::*;
99

1010
fn data() -> Vec<(PathBuf, &'static str)> {

napi/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::{
77
sync::Arc,
88
};
99

10-
use napi::{bindgen_prelude::AsyncTask, Task};
10+
use napi::{Task, bindgen_prelude::AsyncTask};
1111
use napi_derive::napi;
1212
use oxc_resolver::{PackageJson, ResolveOptions, Resolver};
1313

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"devDependencies": {
1919
"@napi-rs/cli": "3.0.0-alpha.72",
2020
"@napi-rs/wasm-runtime": "^0.2.7",
21-
"@types/node": "^22.13.5",
21+
"@types/node": "^22.13.9",
2222
"emnapi": "^1.3.1",
23-
"typescript": "^5.7.3",
24-
"vitest": "^3.0.7"
23+
"typescript": "^5.8.2",
24+
"vitest": "^3.0.8"
2525
},
2626
"packageManager": "[email protected]"
2727
}

0 commit comments

Comments
 (0)