Skip to content

Commit cc54ea0

Browse files
jfrolichjfrolich
committed
♻️ - rename to parse_dirty for clarity
1 parent 061d069 commit cc54ea0

File tree

7 files changed

+35
-25
lines changed

7 files changed

+35
-25
lines changed

‎src/build.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,21 @@ use self::parse::parser_args;
2626
fn is_dirty(module: &Module) -> bool {
2727
match module.source_type {
2828
SourceType::SourceFile(SourceFile {
29-
implementation: Implementation { dirty: true, .. },
29+
implementation: Implementation {
30+
parse_dirty: true, ..
31+
},
3032
..
3133
}) => true,
3234
SourceType::SourceFile(SourceFile {
33-
interface: Some(Interface { dirty: true, .. }),
35+
interface: Some(Interface {
36+
parse_dirty: true, ..
37+
}),
3438
..
3539
}) => true,
3640
SourceType::SourceFile(_) => false,
37-
SourceType::MlMap(MlMap { dirty, .. }) => dirty,
41+
SourceType::MlMap(MlMap {
42+
parse_dirty: dirty, ..
43+
}) => dirty,
3844
}
3945
}
4046

‎src/build/build_types.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub struct Interface {
2323
pub parse_state: ParseState,
2424
pub compile_state: CompileState,
2525
pub last_modified: SystemTime,
26-
pub dirty: bool,
26+
pub parse_dirty: bool,
2727
}
2828

2929
#[derive(Debug, Clone, PartialEq)]
@@ -32,7 +32,7 @@ pub struct Implementation {
3232
pub parse_state: ParseState,
3333
pub compile_state: CompileState,
3434
pub last_modified: SystemTime,
35-
pub dirty: bool,
35+
pub parse_dirty: bool,
3636
}
3737

3838
#[derive(Debug, Clone, PartialEq)]
@@ -43,7 +43,7 @@ pub struct SourceFile {
4343

4444
#[derive(Debug, Clone, PartialEq)]
4545
pub struct MlMap {
46-
pub dirty: bool,
46+
pub parse_dirty: bool,
4747
}
4848

4949
#[derive(Debug, Clone, PartialEq)]

‎src/build/clean.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,15 +190,15 @@ pub fn cleanup_previous_build(
190190

191191
let source_last_modified = interface.last_modified;
192192
if ast_last_modified > &source_last_modified {
193-
interface.dirty = false;
193+
interface.parse_dirty = false;
194194
}
195195
} else {
196196
let implementation = &mut source_file.implementation;
197197
let source_last_modified = implementation.last_modified;
198198
if ast_last_modified > &source_last_modified
199199
&& !deleted_interfaces.contains(module_name)
200200
{
201-
implementation.dirty = false;
201+
implementation.parse_dirty = false;
202202
}
203203
}
204204
}

‎src/build/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ pub fn compile(
270270
match module.source_type {
271271
SourceType::MlMap(ref mut mlmap) => {
272272
module.compile_dirty = false;
273-
mlmap.dirty = false;
273+
mlmap.parse_dirty = false;
274274
}
275275
SourceType::SourceFile(ref mut source_file) => {
276276
match result {

‎src/build/packages.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
618618
build_state.insert_module(
619619
&helpers::file_path_to_module_name(&mlmap.to_owned(), &packages::Namespace::NoNamespace),
620620
Module {
621-
source_type: SourceType::MlMap(MlMap { dirty: false }),
621+
source_type: SourceType::MlMap(MlMap { parse_dirty: false }),
622622
deps,
623623
dependents: AHashSet::new(),
624624
package_name: package.name.to_owned(),
@@ -654,7 +654,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
654654
}
655655
source_file.implementation.path = file.to_owned();
656656
source_file.implementation.last_modified = metadata.modified;
657-
source_file.implementation.dirty = true;
657+
source_file.implementation.parse_dirty = true;
658658
}
659659
_ => (),
660660
})
@@ -665,7 +665,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
665665
parse_state: ParseState::Pending,
666666
compile_state: CompileState::Pending,
667667
last_modified: metadata.modified,
668-
dirty: true,
668+
parse_dirty: true,
669669
},
670670
interface: None,
671671
}),
@@ -698,7 +698,7 @@ pub fn parse_packages(build_state: &mut BuildState) {
698698
parse_state: ParseState::Pending,
699699
compile_state: CompileState::Pending,
700700
last_modified: metadata.modified,
701-
dirty: true,
701+
parse_dirty: true,
702702
});
703703
}
704704
_ => (),
@@ -711,14 +711,14 @@ pub fn parse_packages(build_state: &mut BuildState) {
711711
parse_state: ParseState::Pending,
712712
compile_state: CompileState::Pending,
713713
last_modified: metadata.modified,
714-
dirty: true,
714+
parse_dirty: true,
715715
},
716716
interface: Some(Interface {
717717
path: file.to_owned(),
718718
parse_state: ParseState::Pending,
719719
compile_state: CompileState::Pending,
720720
last_modified: metadata.modified,
721-
dirty: true,
721+
parse_dirty: true,
722722
}),
723723
}),
724724
deps: AHashSet::new(),

‎src/build/parse.rs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ pub fn generate_asts(
3535
SourceType::SourceFile(source_file) => {
3636
let root_package = build_state.get_package(&build_state.root_config_name).unwrap();
3737

38-
let (ast_path, iast_path, dirty) = if source_file.implementation.dirty
39-
|| source_file.interface.as_ref().map(|i| i.dirty).unwrap_or(false)
38+
let (ast_path, iast_path, dirty) = if source_file.implementation.parse_dirty
39+
|| source_file
40+
.interface
41+
.as_ref()
42+
.map(|i| i.parse_dirty)
43+
.unwrap_or(false)
4044
{
4145
inc();
4246
let ast_result = generate_ast(
@@ -102,11 +106,11 @@ pub fn generate_asts(
102106
Ok((_path, err)) => {
103107
match module.source_type {
104108
SourceType::SourceFile(ref mut source_file) => {
105-
source_file.implementation.dirty = false;
109+
source_file.implementation.parse_dirty = false;
106110
source_file
107111
.interface
108112
.as_mut()
109-
.map(|interface| interface.dirty = false);
113+
.map(|interface| interface.parse_dirty = false);
110114
}
111115
_ => (),
112116
}
@@ -123,7 +127,7 @@ pub fn generate_asts(
123127
match module.source_type {
124128
SourceType::SourceFile(ref mut source_file) => {
125129
source_file.implementation.parse_state = ParseState::Warning;
126-
source_file.implementation.dirty = true;
130+
source_file.implementation.parse_dirty = true;
127131
}
128132
_ => (),
129133
}
@@ -136,7 +140,7 @@ pub fn generate_asts(
136140
match module.source_type {
137141
SourceType::SourceFile(ref mut source_file) => {
138142
source_file.implementation.parse_state = ParseState::ParseError;
139-
source_file.implementation.dirty = true;
143+
source_file.implementation.parse_dirty = true;
140144
}
141145
_ => (),
142146
}
@@ -154,7 +158,7 @@ pub fn generate_asts(
154158
SourceType::SourceFile(ref mut source_file) => {
155159
source_file.interface.as_mut().map(|interface| {
156160
interface.parse_state = ParseState::ParseError;
157-
interface.dirty = true;
161+
interface.parse_dirty = true;
158162
});
159163
}
160164
_ => (),
@@ -170,7 +174,7 @@ pub fn generate_asts(
170174
SourceType::SourceFile(ref mut source_file) => {
171175
source_file.interface.as_mut().map(|interface| {
172176
interface.parse_state = ParseState::ParseError;
173-
interface.dirty = true;
177+
interface.parse_dirty = true;
174178
});
175179
}
176180
_ => (),

‎src/watcher.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ async fn async_watch(
116116
{
117117
source_file.implementation.last_modified = modified;
118118
};
119-
source_file.implementation.dirty = true;
119+
source_file.implementation.parse_dirty = true;
120120
break;
121121
}
122122

@@ -132,7 +132,7 @@ async fn async_watch(
132132
{
133133
interface.last_modified = modified;
134134
}
135-
interface.dirty = true;
135+
interface.parse_dirty = true;
136136
break;
137137
}
138138
}

0 commit comments

Comments
 (0)