finchie/depwiz - Change WFBF7VS6OFN23TQBQGOPUOGMIHXVBTFJ2GFLDYET6IQLY7VOS7RAC

Split `annotations` and `graph` into 2 separate modules

Should make the distinction between getting the information and actually working with the information, especially once unit graph support is added.

Created by finchie on May 8, 2024

WFBF7VS6OFN23TQBQGOPUOGMIHXVBTFJ2GFLDYET6IQLY7VOS7RAC

Dependencies

In channels

main

Change contents

Replacement in src/visualize/treemap.rs at line 1 [2.35]
B:BD[2.35] → [2.36:60]
```
use crate::Annotations;
```
[2.35]
[2.60]
```
use crate::AnnotationGraph;
```
Replacement in src/visualize/treemap.rs at line 23 [2.35]
B:BD[2.505] → [2.505:536]
```
    annotations: &Annotations,
```
[2.505]
[2.536]
```
    annotations: &AnnotationGraph,
```

Replacement in src/visualize/sankey.rs at line 1 [4.34]

B:BD[4.34] → [5.0:49]

use crate::{Annotations, Measurement, Variable};

[4.34]

[4.55]

use crate::{AnnotationGraph, Measurement, Variable};

Replacement in src/visualize/sankey.rs at line 3 [4.34]

B:BD[4.56] → [5.50:127]

pub fn nodes<'graph>(annotations: &'graph Annotations) -> Vec<&'graph str> {

[4.56]

[5.127]

pub fn nodes<'graph>(annotations: &'graph AnnotationGraph) -> Vec<&'graph str> {

Replacement in src/visualize/sankey.rs at line 10 [4.34]

B:BD[4.218] → [5.243:340]

pub fn links<'graph>(annotations: &'graph Annotations) -> Vec<(&'graph str, &'graph str, f64)> {

[4.218]

[5.340]

pub fn links<'graph>(annotations: &'graph AnnotationGraph) -> Vec<(&'graph str, &'graph str, f64)> {

Replacement in src/visualize/mod.rs at line 18 [6.54]

B:BD[6.277] → [5.870:937]

pub fn for_style(style: Style, annotations: &crate::Annotations) {

[6.277]

[6.359]

pub fn for_style(style: Style, annotations: &crate::AnnotationGraph) {

Replacement in src/visualize/histogram.rs at line 1 [7.817]
B:BD[7.817] → [5.1345:1394]
```
use crate::{Annotations, Measurement, Variable};
```
[7.817]
[7.838]
```
use crate::{AnnotationGraph, Measurement, Variable};
```

Replacement in src/visualize/histogram.rs at line 26 [7.817]

B:BD[7.1371] → [5.1395:1452]

pub fn axes(annotations: &Annotations) -> (Axis, Axis) {

[7.1371]

[5.1452]

pub fn axes(annotations: &AnnotationGraph) -> (Axis, Axis) {

Replacement in src/visualize/histogram.rs at line 49 [7.817]

B:BD[7.2176] → [5.1655:1714]

pub fn data(annotations: &Annotations) -> Vec<DataPoint> {

[7.2176]

[5.1714]

pub fn data(annotations: &AnnotationGraph) -> Vec<DataPoint> {

Replacement in src/visualize/graph.rs at line 1 [8.146]

B:BD[8.146] → [5.1916:1965]

use crate::{Annotations, Measurement, Variable};

[8.146]

[8.178]

use crate::{AnnotationGraph, Measurement, Variable};

Replacement in src/visualize/graph.rs at line 8 [8.146]
B:BD[8.315] → [5.2013:2051]
```
    annotations: &'graph Annotations,
```
[8.315]
[8.352]
```
    annotations: &'graph AnnotationGraph,
```

Replacement in src/visualize/graph.rs at line 42 [8.146]

B:BD[8.1551] → [5.2544:2616]

pub fn data(annotations: &Annotations) -> charming::series::GraphData {

[8.1551]

[8.1618]

pub fn data(annotations: &AnnotationGraph) -> charming::series::GraphData {

Insertion in src/main.rs at line 6 [9.49]
[5.3041]
[6.1121]
```
mod graph;
```

Replacement in src/main.rs at line 9 [9.49]

B:BD[10.1078] → [5.3042:3101]

pub use annotations::{Annotations, Measurement, Variable};

[10.1078]

[5.3101]

pub use graph::{AnnotationGraph, Measurement, Variable};

Insertion in src/main.rs at line 15 [9.49]

[5.3169]

[11.2757]

    let self_profile = annotations::self_profile::ProfileCollection::new();

Replacement in src/main.rs at line 20 [9.49]

B:BD[9.897] → [5.3170:3253]

    let annotations = annotations::Annotations::new(&package_graph, timings.repr);

[9.897]

[5.3253]

    let graph = AnnotationGraph::new(&package_graph, timings, self_profile);

Replacement in src/main.rs at line 22 [9.49]

B:BD[5.3254] → [5.3254:3321]

    visualize::for_style(visualize::Style::Treemap, &annotations);

[5.3254]

[9.924]

    visualize::for_style(visualize::Style::Treemap, &graph);

File addition: graph (d--x------)
[9.15]
File move: mod.rs → mod.rs
BF:BFD[5.3345] → [5.3418:3448]
BF:BF[5.3448] → [5.3449:3449]
[0.1033]
[5.3449]
Replacement in src/graph/mod.rs at line 1 [5.3449]
B:BD[5.3449] → [5.3450:3481]
```
use std::collections::HashMap;
```
[5.3449]
[5.3481]
```
use crate::annotations::{self_profile, timings};
```
Deletion in src/graph/mod.rs at line 11 [5.3449]
B:BD[5.3746] → [3.8097:8115]
∅:D[3.8115] → [5.3746:3764]
B:BD[5.3746] → [5.3746:3764]
```
mod self_profile;
pub mod timings;
```
Replacement in src/graph/mod.rs at line 36 [5.3449]
B:BD[5.4212] → [5.4212:4245]
```
pub struct Annotations<'graph> {
```
[5.4212]
[5.4245]
```
pub struct AnnotationGraph<'graph> {
```
Replacement in src/graph/mod.rs at line 42 [5.3449]
B:BD[5.4379] → [5.4379:4414]
```
impl<'graph> Annotations<'graph> {
```
[5.4379]
[5.4414]
```
impl<'graph> AnnotationGraph<'graph> {
```

Replacement in src/graph/mod.rs at line 45 [5.3449]

B:BD[5.4475] → [5.4475:4539]

        mut timings: HashMap<PackageId, Vec<timings::Message>>,

[5.4475]

[5.4539]

        mut timings: timings::Output,
        self_profile: self_profile::ProfileCollection,

Replacement in src/graph/mod.rs at line 48 [5.3449]

B:BD[5.4555] → [3.8116:8251]

        let profile_data = self_profile::ProfileCollection::new();
        dbg!(profile_data.probes.len(), profile_data.crates.len());

[5.4555]

[3.8251]

        dbg!(self_profile.probes.len(), self_profile.crates.len());

Replacement in src/graph/mod.rs at line 60 [5.3449]

B:BD[5.4926] → [5.4926:4971]

                timings: timings.remove(id),

[5.4926]

[5.4971]

                timings: timings.repr.remove(id),

Deletion in src/annotations/timings.rs at line 5 [11.35]
B:BD[11.108] → [12.0:41]
B:BD[12.41] → [13.32:61]
```
use cargo_metadata::camino::Utf8PathBuf;
use cargo_metadata::Edition;
```

Deletion in src/annotations/timings.rs at line 26 [11.35]

B:BD[11.614] → [11.614:617]

B:BD[11.617] → [12.452:991]

B:BD[12.991] → [14.730:752]

∅:D[14.752] → [12.1009:1160]

B:BD[12.1009] → [12.1009:1160]

}
/// See https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/enum.TargetKind.html
/// and https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/enum.TargetKind.html#impl-Serialize-for-TargetKind
/// This is different to the original enum as `CrateType` has been manually flattened into this enum,
/// so some information is lost in favour of simplicity
// TODO: fix this limitation, make `TargetKind` match cargo's definition
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum TargetKind {
    Lib,
    Bin,
    Test,
    Bench,
    ExampleLib,
    ExampleBin,
    CustomBuild,
    Rlib,
    Dylib,
    Cdylib,
    Staticlib,
    ProcMacro,

Deletion in src/annotations/timings.rs at line 28 [11.35]

B:BD[12.1163] → [12.1163:1311]

B:BD[12.1311] → [14.753:945]

∅:D[14.945] → [12.1471:1474]

B:BD[12.1471] → [12.1471:1474]

/// See https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/struct.TargetInner.html
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Target {
    pub kind: Vec<TargetKind>,
    pub name: String,
    pub src_path: Utf8PathBuf,
    pub edition: Edition,
    pub doc: bool,
    pub doctest: bool,
    pub test: bool,
}

Replacement in src/annotations/timings.rs at line 35 [11.35]
B:BD[14.1015] → [14.1015:1039]
```
    pub target: Target,
```
[14.1015]
[14.1039]
```
    pub target: super::Target,
```
Replacement in src/annotations/self_profile.rs at line 67 [3.66]
B:BD[3.2061] → [3.2061:2115]
```
    pub crate_types: Vec<super::timings::TargetKind>,
```
[3.2061]
[3.2115]
```
    pub crate_types: Vec<super::TargetKind>,
```

File addition: mod.rs (----------)

[5.3345]

use camino::Utf8PathBuf;
use cargo_metadata::Edition;
use serde::{Deserialize, Serialize};
pub mod self_profile;
pub mod timings;
/// See https://docs.rs/cargo/latest/cargo/core/compiler/enum.CompileMode.html
/// These are the only two cases we are interested in
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum Mode {
    Build,
    RunCustomBuild,
}
/// See https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/enum.TargetKind.html
/// and https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/enum.TargetKind.html#impl-Serialize-for-TargetKind
/// This is different to the original enum as `CrateType` has been manually flattened into this enum,
/// so some information is lost in favour of simplicity
// TODO: fix this limitation, make `TargetKind` match cargo's definition
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "kebab-case")]
pub enum TargetKind {
    Lib,
    Bin,
    Test,
    Bench,
    ExampleLib,
    ExampleBin,
    CustomBuild,
    Rlib,
    Dylib,
    Cdylib,
    Staticlib,
    ProcMacro,
}
/// See https://doc.rust-lang.org/nightly/nightly-rustc/cargo/core/manifest/struct.TargetInner.html
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct Target {
    pub kind: Vec<TargetKind>,
    pub name: String,
    pub src_path: Utf8PathBuf,
    pub edition: Edition,
    pub doc: bool,
    pub doctest: bool,
    pub test: bool,
}

Split `annotations` and `graph` into 2 separate modules

Dependencies

In channels

Change contents

Replacement in src/visualize/treemap.rs at line 1 [2.35]

Replacement in src/visualize/treemap.rs at line 23 [2.35]

Replacement in src/visualize/sankey.rs at line 1 [4.34]

Replacement in src/visualize/sankey.rs at line 3 [4.34]

Replacement in src/visualize/sankey.rs at line 10 [4.34]

Replacement in src/visualize/mod.rs at line 18 [6.54]

Replacement in src/visualize/histogram.rs at line 1 [7.817]

Replacement in src/visualize/histogram.rs at line 26 [7.817]

Replacement in src/visualize/histogram.rs at line 49 [7.817]

Replacement in src/visualize/graph.rs at line 1 [8.146]

Replacement in src/visualize/graph.rs at line 8 [8.146]

Replacement in src/visualize/graph.rs at line 42 [8.146]

Insertion in src/main.rs at line 6 [9.49]

Replacement in src/main.rs at line 9 [9.49]

Insertion in src/main.rs at line 15 [9.49]

Replacement in src/main.rs at line 20 [9.49]

Replacement in src/main.rs at line 22 [9.49]

File addition: graph (d--x------)

File move: mod.rs → mod.rs

Replacement in src/graph/mod.rs at line 1 [5.3449]

Deletion in src/graph/mod.rs at line 11 [5.3449]

Replacement in src/graph/mod.rs at line 36 [5.3449]

Replacement in src/graph/mod.rs at line 42 [5.3449]

Replacement in src/graph/mod.rs at line 45 [5.3449]

Replacement in src/graph/mod.rs at line 48 [5.3449]

Replacement in src/graph/mod.rs at line 60 [5.3449]

Deletion in src/annotations/timings.rs at line 5 [11.35]

Deletion in src/annotations/timings.rs at line 26 [11.35]

Deletion in src/annotations/timings.rs at line 28 [11.35]

Replacement in src/annotations/timings.rs at line 35 [11.35]

Replacement in src/annotations/self_profile.rs at line 67 [3.66]

File addition: mod.rs (----------)