Skip to content

Commit e08848c

Browse files
dnblndnbln
committed
dirty_reason.rs: Remove "From" and "To" statuses
1 parent 1966436 commit e08848c

File tree

8 files changed

+18
-139
lines changed

8 files changed

+18
-139
lines changed

‎Cargo.toml

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ cargo-util = { path = "crates/cargo-util", version = "0.2.3" }
2222
crates-io = { path = "crates/crates-io", version = "0.35.0" }
2323
curl = { version = "0.4.44", features = ["http2"] }
2424
curl-sys = "0.4.59"
25-
dissimilar = "1.0"
2625
env_logger = "0.10.0"
2726
pretty_env_logger = { version = "0.4", optional = true }
2827
anyhow = "1.0.47"

‎crates/cargo-test-support/src/compare.rs

+3-4
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@ fn substitute_macros(input: &str) -> String {
196196
("[SCRAPING]", " Scraping"),
197197
("[FRESH]", " Fresh"),
198198
("[DIRTY]", " Dirty"),
199-
("[FROM]", " From"),
200-
("[TO]", " To"),
201199
("[UPDATING]", " Updating"),
202200
("[ADDING]", " Adding"),
203201
("[REMOVING]", " Removing"),
@@ -755,9 +753,10 @@ B", false,
755753
true,
756754
);
757755
case(
758-
"",
756+
"\n",
759757
"\
760-
[DIRTY-MSVC] a",
758+
[DIRTY-MSVC] a
759+
",
761760
false,
762761
);
763762

‎src/cargo/core/compiler/fingerprint/dirty_reason.rs

+15-108
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ use super::*;
22
use crate::core::Shell;
33

44
use crate::Config;
5-
use dissimilar::Chunk;
6-
use itertools::Itertools;
75
use std::fmt;
86

97
#[derive(Debug)]
@@ -77,11 +75,16 @@ pub enum DirtyReason {
7775
}
7876

7977
impl DirtyReason {
80-
pub fn presentation<'a>(&'a self, unit: &'a Unit, config: &'a Config) -> DirtyReasonPrettyPresentation<'a> {
78+
pub fn presentation<'a>(
79+
&'a self,
80+
unit: &'a Unit,
81+
config: &'a Config,
82+
) -> DirtyReasonPrettyPresentation<'a> {
8183
DirtyReasonPrettyPresentation(self, unit, config)
8284
}
8385
}
8486

87+
#[allow(dead_code)] // fields to be used in the future
8588
pub struct DirtyReasonDeps {
8689
pub(super) old: Vec<DepFingerprint>,
8790
pub(super) new: Vec<DepFingerprint>,
@@ -269,73 +272,14 @@ impl std::error::Error for DirtyReason {}
269272

270273
pub struct DirtyReasonPrettyPresentation<'a>(&'a DirtyReason, &'a Unit, &'a Config);
271274

272-
pub fn diffed(a: &str, b: &str) -> (String, String) {
273-
let mut s1 = String::new();
274-
let mut s2 = String::new();
275-
276-
for chunk in dissimilar::diff(a, b) {
277-
match chunk {
278-
Chunk::Equal(s) => {
279-
s1.push_str(s);
280-
s2.push_str(s);
281-
}
282-
Chunk::Delete(s) => {
283-
s1.push_str(s);
284-
s2.push_str(&" ".repeat(s.len()));
285-
}
286-
Chunk::Insert(s) => {
287-
s1.push_str(&" ".repeat(s.len()));
288-
s2.push_str(s);
289-
}
290-
}
291-
}
292-
293-
(s1, s2)
294-
}
295-
296275
trait ShellExt {
297276
fn dirty_because(&mut self, unit: &Unit, s: impl fmt::Display) -> CargoResult<()>;
298-
fn from(&mut self, s: impl fmt::Display) -> CargoResult<()>;
299-
fn to(&mut self, s: impl fmt::Display) -> CargoResult<()>;
300-
301-
fn changed(&mut self, old: impl fmt::Display, new: impl fmt::Display) -> CargoResult<()>;
302-
fn changed_diffed(&mut self, old: impl fmt::Display, new: impl fmt::Display)
303-
-> CargoResult<()>;
304277
}
305278

306279
impl ShellExt for Shell {
307280
fn dirty_because(&mut self, unit: &Unit, s: impl fmt::Display) -> CargoResult<()> {
308281
self.status("Dirty", format!("{}: {s}", &unit.pkg))
309282
}
310-
311-
fn from(&mut self, s: impl fmt::Display) -> CargoResult<()> {
312-
self.status("From", s)
313-
}
314-
315-
fn to(&mut self, s: impl fmt::Display) -> CargoResult<()> {
316-
self.status("To", s)
317-
}
318-
319-
fn changed(&mut self, old: impl fmt::Display, new: impl fmt::Display) -> CargoResult<()> {
320-
self.verbose(|s| {
321-
s.from(&old)?;
322-
s.to(&new)?;
323-
324-
Ok(())
325-
})
326-
}
327-
328-
fn changed_diffed(
329-
&mut self,
330-
old: impl fmt::Display,
331-
new: impl fmt::Display,
332-
) -> CargoResult<()> {
333-
self.verbose(|s| {
334-
let (old_pretty, new_pretty) = diffed(&old.to_string(), &new.to_string());
335-
336-
s.changed(old_pretty, new_pretty)
337-
})
338-
}
339283
}
340284

341285
struct FileTimeDiff {
@@ -396,15 +340,10 @@ impl<'a> DirtyReasonPrettyPresentation<'a> {
396340
fn present_dependency_diffs(
397341
s: &mut Shell,
398342
unit: &Unit,
399-
deps: &DirtyReasonDeps,
343+
_deps: &DirtyReasonDeps,
400344
) -> CargoResult<()> {
401345
s.dirty_because(unit, "the list of dependencies changed")?;
402346

403-
let old_deps = deps.old.iter().map(|it| &it.name).sorted().join(", ");
404-
let new_deps = deps.new.iter().map(|it| &it.name).sorted().join(", ");
405-
406-
s.changed_diffed(old_deps, new_deps)?;
407-
408347
Ok(())
409348
}
410349

@@ -426,9 +365,8 @@ impl<'a> DirtyReasonPrettyPresentation<'a> {
426365

427366
match &self.0 {
428367
DirtyReason::RustcChanged => s.dirty_because(unit, "the toolchain changed"),
429-
DirtyReason::FeaturesChanged { old, new } => {
368+
DirtyReason::FeaturesChanged { .. } => {
430369
s.dirty_because(unit, "the list of features changed")?;
431-
s.changed_diffed(old, new)?;
432370

433371
Ok(())
434372
}
@@ -441,11 +379,9 @@ impl<'a> DirtyReasonPrettyPresentation<'a> {
441379
DirtyReason::ProfileConfigurationChanged => {
442380
s.dirty_because(unit, "the profile configuration changed")
443381
}
444-
DirtyReason::RustflagsChanged { old, new } => {
382+
DirtyReason::RustflagsChanged { .. } => {
445383
s.dirty_because(unit, "the rustflags changed")?;
446384

447-
s.changed_diffed(&old.join(" "), &new.join(" "))?;
448-
449385
Ok(())
450386
}
451387
DirtyReason::MetadataChanged => s.dirty_because(unit, "the metadata changed"),
@@ -463,60 +399,39 @@ impl<'a> DirtyReasonPrettyPresentation<'a> {
463399

464400
Ok(())
465401
}
466-
DirtyReason::PrecalculatedComponentsChanged { old, new } => {
402+
DirtyReason::PrecalculatedComponentsChanged { .. } => {
467403
s.dirty_because(unit, "the precalculated components changed")?;
468-
s.changed(old, new)?;
469404

470405
Ok(())
471406
}
472407
DirtyReason::DepInfoOutputChanged { .. } => {
473408
s.dirty_because(unit, "the dependency info output changed")
474409
}
475-
DirtyReason::RerunIfChangedOutputRootChanged { old, new } => {
410+
DirtyReason::RerunIfChangedOutputRootChanged { .. } => {
476411
s.dirty_because(
477412
unit,
478413
"the working directories for `rerun-if-changed` instructions changed",
479414
)?;
480415

481-
s.changed(old.display(), new.display())?;
482-
483416
Ok(())
484417
}
485-
DirtyReason::RerunIfChangedOutputChanged { old, new } => {
418+
DirtyReason::RerunIfChangedOutputChanged { .. } => {
486419
s.dirty_because(unit, "the rerun-if-changed instructions changed")?;
487420

488-
s.verbose(|s| {
489-
let old_str = old.iter().map(|it| format!("{it:?}")).join(", ");
490-
let new_str = new.iter().map(|it| format!("{it:?}")).join(", ");
491-
492-
s.changed_diffed(old_str, new_str)?;
493-
494-
Ok(())
495-
})?;
496-
497421
Ok(())
498422
}
499423
DirtyReason::EnvVarsChanged { .. } => {
500424
s.dirty_because(unit, "the environment variables changed")?;
501425

502426
Ok(())
503427
}
504-
DirtyReason::EnvVarChanged {
505-
name,
506-
old_value,
507-
new_value,
508-
} => {
428+
DirtyReason::EnvVarChanged { name, .. } => {
509429
s.dirty_because(unit, format!("the env variable {name} changed"))?;
510-
s.changed(
511-
old_value.as_ref().map_or("<missing>", String::as_str),
512-
new_value.as_ref().map_or("<missing>", String::as_str),
513-
)?;
514430

515431
Ok(())
516432
}
517-
DirtyReason::LocalFingerprintTypeChanged { old, new } => {
433+
DirtyReason::LocalFingerprintTypeChanged { .. } => {
518434
s.dirty_because(unit, "the local fingerprint type changed")?;
519-
s.changed(old, new)?;
520435

521436
Ok(())
522437
}
@@ -552,16 +467,8 @@ impl<'a> DirtyReasonPrettyPresentation<'a> {
552467
),
553468
)
554469
}
555-
StaleItem::ChangedEnv {
556-
var,
557-
previous,
558-
current,
559-
} => {
470+
StaleItem::ChangedEnv { var, .. } => {
560471
s.dirty_because(unit, format!("the environment variable {var} changed"))?;
561-
s.changed(
562-
previous.as_ref().map_or("<missing>", String::as_str),
563-
current.as_ref().map_or("<missing>", String::as_str),
564-
)?;
565472
Ok(())
566473
}
567474
},

‎tests/testsuite/build_script.rs

-8
Original file line numberDiff line numberDiff line change
@@ -1215,8 +1215,6 @@ fn only_rerun_build_script() {
12151215
.with_stderr(
12161216
"\
12171217
[DIRTY] foo v0.5.0 ([CWD]): the precalculated components changed
1218-
[FROM] [..]
1219-
[TO] [..]
12201218
[COMPILING] foo v0.5.0 ([CWD])
12211219
[RUNNING] `[..]/build-script-build`
12221220
[RUNNING] `rustc --crate-name foo [..]`
@@ -1324,8 +1322,6 @@ fn testing_and_such() {
13241322
.with_stderr(
13251323
"\
13261324
[DIRTY] foo v0.5.0 ([CWD]): the precalculated components changed
1327-
[FROM] [..]
1328-
[TO] [..]
13291325
[COMPILING] foo v0.5.0 ([CWD])
13301326
[RUNNING] `[..]/build-script-build`
13311327
[RUNNING] `rustc --crate-name foo [..]`
@@ -1749,8 +1745,6 @@ fn out_dir_is_preserved() {
17491745
.with_stderr(
17501746
"\
17511747
[DIRTY] foo [..]: the precalculated components changed
1752-
[FROM] [..]
1753-
[TO] [..]
17541748
[COMPILING] foo [..]
17551749
[RUNNING] `[..]build-script-build`
17561750
[RUNNING] `rustc --crate-name foo [..]
@@ -3016,8 +3010,6 @@ fn changing_an_override_invalidates() {
30163010
.with_stderr(
30173011
"\
30183012
[DIRTY] foo v0.5.0 ([..]): the precalculated components changed
3019-
[FROM] [..]
3020-
[TO] [..]
30213013
[COMPILING] foo v0.5.0 ([..]
30223014
[RUNNING] `rustc [..] -L native=bar`
30233015
[FINISHED] dev [unoptimized + debuginfo] target(s) in [..]

‎tests/testsuite/config_include.rs

-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,6 @@ fn works_with_cli() {
7575
.with_stderr(
7676
"\
7777
[DIRTY] foo v0.0.1 ([..]): the rustflags changed
78-
[FROM] -W unused
79-
[TO] -W unsafe-code -W unused
8078
[COMPILING] foo v0.0.1 [..]
8179
[RUNNING] `rustc [..]-W unsafe-code -W unused`
8280
[FINISHED] [..]

‎tests/testsuite/freshness.rs

-10
Original file line numberDiff line numberDiff line change
@@ -1904,8 +1904,6 @@ fn simulated_docker_deps_stay_cached() {
19041904
[FRESH] regdep_old_style [..]
19051905
[FRESH] regdep_rerun [..]
19061906
[DIRTY] foo [..]: the precalculated components changed
1907-
[FROM] [..]
1908-
[TO] [..]
19091907
[COMPILING] foo [..]
19101908
[RUNNING] [..]/foo-[..]/build-script-build[..]
19111909
[RUNNING] `rustc --crate-name foo[..]
@@ -2138,8 +2136,6 @@ fn rerun_if_changes() {
21382136
.with_stderr(
21392137
"\
21402138
[DIRTY] foo [..]: the env variable FOO changed
2141-
[FROM] <missing>
2142-
[TO] 1
21432139
[COMPILING] foo [..]
21442140
[RUNNING] `[..]build-script-build`
21452141
[RUNNING] `rustc [..]
@@ -2158,8 +2154,6 @@ fn rerun_if_changes() {
21582154
.with_stderr(
21592155
"\
21602156
[DIRTY] foo [..]: the env variable BAR changed
2161-
[FROM] <missing>
2162-
[TO] 1
21632157
[COMPILING] foo [..]
21642158
[RUNNING] `[..]build-script-build`
21652159
[RUNNING] `rustc [..]
@@ -2178,8 +2172,6 @@ fn rerun_if_changes() {
21782172
.with_stderr(
21792173
"\
21802174
[DIRTY] foo [..]: the env variable FOO changed
2181-
[FROM] 1
2182-
[TO] <missing>
21832175
[COMPILING] foo [..]
21842176
[RUNNING] `[..]build-script-build`
21852177
[RUNNING] `rustc [..]
@@ -2667,8 +2659,6 @@ fn cargo_env_changes() {
26672659
.with_stderr(
26682660
"\
26692661
[DIRTY] foo v1.0.0 ([..]): the environment variable CARGO changed
2670-
[FROM] [..]
2671-
[TO] [..]
26722662
[CHECKING] foo [..]
26732663
[RUNNING] `rustc [..]
26742664
[FINISHED] [..]

‎tests/testsuite/git.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2522,8 +2522,6 @@ fn include_overrides_gitignore() {
25222522
.with_stderr(
25232523
"\
25242524
[DIRTY] foo v0.5.0 ([..]): the precalculated components changed
2525-
[FROM] [..]
2526-
[TO] [..]
25272525
[COMPILING] foo v0.5.0 ([..])
25282526
[RUNNING] `[..]build-script-build[..]`
25292527
[RUNNING] `rustc --crate-name foo src/lib.rs [..]`

‎tests/testsuite/lto.rs

-4
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,6 @@ fn dylib() {
596596
[FRESH] registry v0.0.1
597597
[RUNNING] `rustc --crate-name registry_shared [..]-C embed-bitcode=no[..]
598598
[DIRTY] bar v0.0.0 ([..]): the list of dependencies changed
599-
[FROM] registry, registry_shared
600-
[TO] registry, registry_shared
601599
[COMPILING] bar [..]
602600
[RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-C embed-bitcode=no[..]
603601
[FINISHED] [..]
@@ -616,8 +614,6 @@ fn dylib() {
616614
[COMPILING] registry v0.0.1
617615
[RUNNING] `rustc --crate-name registry [..]
618616
[DIRTY] bar v0.0.0 ([..]): the list of dependencies changed
619-
[FROM] registry, registry_shared
620-
[TO] registry, registry_shared
621617
[COMPILING] bar [..]
622618
[RUNNING] `rustc --crate-name bar [..]--crate-type dylib [..]-C embed-bitcode=no[..]
623619
[RUNNING] `rustc --crate-name bar [..]-C lto [..]--test[..]

0 commit comments

Comments
 (0)