Skip to content

Commit 69f4b5c

Browse files
committed
refactor: rename job.rs -> job_queue/job.rs
1 parent 5e2f3ca commit 69f4b5c

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

src/cargo/core/compiler/custom_build.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use super::job::{Job, Work};
2-
use super::{fingerprint, Context, LinkType, Unit};
1+
use super::{fingerprint, Context, Job, LinkType, Unit, Work};
32
use crate::core::compiler::artifact;
43
use crate::core::compiler::context::Metadata;
54
use crate::core::compiler::job_queue::JobState;

src/cargo/core/compiler/fingerprint/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -374,8 +374,7 @@ use crate::util::{internal, path_args, profile, StableHasher};
374374
use crate::CARGO_ENV;
375375

376376
use super::custom_build::BuildDeps;
377-
use super::job::{Job, Work};
378-
use super::{BuildContext, Context, FileFlavor, Unit};
377+
use super::{BuildContext, Context, FileFlavor, Job, Unit, Work};
379378

380379
pub use dirty_reason::DirtyReason;
381380

src/cargo/core/compiler/job.rs renamed to src/cargo/core/compiler/job_queue/job.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
//! See [`Job`] and [`Work`].
2+
13
use std::fmt;
24
use std::mem;
35

4-
use super::job_queue::JobState;
6+
use super::JobState;
57
use crate::core::compiler::fingerprint::DirtyReason;
68
use crate::util::CargoResult;
79

src/cargo/core/compiler/job_queue/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
//! [`push`]: Queue::push
120120
//! [`push_bounded`]: Queue::push_bounded
121121
122+
mod job;
123+
122124
use std::cell::{Cell, RefCell};
123125
use std::collections::{BTreeMap, HashMap, HashSet};
124126
use std::fmt::Write as _;
@@ -135,11 +137,9 @@ use jobserver::{Acquired, Client, HelperThread};
135137
use log::{debug, trace};
136138
use semver::Version;
137139

140+
pub use self::job::Freshness::{self, Dirty, Fresh};
141+
pub use self::job::{Job, Work};
138142
use super::context::OutputFile;
139-
use super::job::{
140-
Freshness::{self, Dirty, Fresh},
141-
Job,
142-
};
143143
use super::timings::Timings;
144144
use super::{BuildContext, BuildPlan, CompileMode, Context, Unit};
145145
use crate::core::compiler::future_incompat::{

src/cargo/core/compiler/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ mod crate_type;
4242
mod custom_build;
4343
mod fingerprint;
4444
pub mod future_incompat;
45-
mod job;
4645
mod job_queue;
4746
mod layout;
4847
mod links;
@@ -79,9 +78,8 @@ pub use self::context::{Context, Metadata};
7978
pub use self::crate_type::CrateType;
8079
pub use self::custom_build::{BuildOutput, BuildScriptOutputs, BuildScripts};
8180
pub(crate) use self::fingerprint::DirtyReason;
82-
pub use self::job::Freshness;
83-
use self::job::{Job, Work};
84-
use self::job_queue::{JobQueue, JobState};
81+
pub use self::job_queue::Freshness;
82+
use self::job_queue::{Job, JobQueue, JobState, Work};
8583
pub(crate) use self::layout::Layout;
8684
pub use self::lto::Lto;
8785
use self::output_depinfo::output_depinfo;

0 commit comments

Comments
 (0)