Skip to content

Commit 4c0f97d

Browse files
Fix import ordering according to updated Rust conventions with proper source priority
Co-authored-by: overlookmotel <557937+overlookmotel@users.noreply.github.com>
1 parent 3607116 commit 4c0f97d

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

apps/oxlint/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
use std::{ffi::OsStr, io::BufWriter};
22

3-
use cli::{CliRunResult, LintRunner};
3+
pub use oxc_linter::{
4+
ExternalLinter, ExternalLinterLintFileCb, ExternalLinterLoadPluginCb, LintFileResult,
5+
PluginLoadResult,
6+
};
47

58
mod command;
69
mod lint;
@@ -13,10 +16,7 @@ pub mod cli {
1316
pub use crate::{command::*, lint::LintRunner, result::CliRunResult};
1417
}
1518

16-
pub use oxc_linter::{
17-
ExternalLinter, ExternalLinterLintFileCb, ExternalLinterLoadPluginCb, LintFileResult,
18-
PluginLoadResult,
19-
};
19+
use cli::{CliRunResult, LintRunner};
2020

2121
#[cfg(all(feature = "oxlint2", not(feature = "disable_oxlint2")))]
2222
mod raw_fs;

apps/oxlint/src/tester.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use lazy_regex::Regex;
88

99
#[cfg(test)]
1010
use crate::cli::{LintRunner, lint_command};
11+
1112
#[cfg(test)]
1213
pub struct Tester {
1314
cwd: PathBuf,

crates/oxc_language_server/src/main.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@ use tower_lsp_server::{
1818
},
1919
};
2020

21-
use capabilities::Capabilities;
22-
use code_actions::CODE_ACTION_KIND_SOURCE_FIX_ALL_OXC;
23-
use commands::{FIX_ALL_COMMAND_ID, FixAllCommandArgs};
24-
use options::{Options, Run, WorkspaceOption};
25-
use worker::WorkspaceWorker;
26-
2721
mod capabilities;
2822
mod code_actions;
2923
mod commands;
@@ -33,6 +27,12 @@ mod options;
3327
mod tester;
3428
mod worker;
3529

30+
use capabilities::Capabilities;
31+
use code_actions::CODE_ACTION_KIND_SOURCE_FIX_ALL_OXC;
32+
use commands::{FIX_ALL_COMMAND_ID, FixAllCommandArgs};
33+
use options::{Options, Run, WorkspaceOption};
34+
use worker::WorkspaceWorker;
35+
3636
type ConcurrentHashMap<K, V> = papaya::HashMap<K, V, FxBuildHasher>;
3737

3838
const OXC_CONFIG_FILE: &str = ".oxlintrc.json";

crates/oxc_transformer/src/options/es_features.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use browserslist::Version;
77
use rustc_hash::FxHashMap;
88

99
use super::{Engine, EngineTargets};
10+
1011
#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash)]
1112
pub enum ESFeature {
1213
ES5MemberExpressionLiterals,

0 commit comments

Comments
 (0)