pmeunier/elpe - Change 7Q4257EPUSDGELWJYF23GKUXGJGOB2QJGPKN3JS3C272IEX6EQ2QC

Formatting, cleanup and Rust 2021 compatibility

Created by pmeunier 2 days ago

7Q4257EPUSDGELWJYF23GKUXGJGOB2QJGPKN3JS3C272IEX6EQ2QC

Dependencies

In channels

main

Change contents

Replacement in src/mount.rs at line 1 [3.50]

B:BD[3.50] → [4.0:48]

use libc::{MS_BIND, MS_PRIVATE, mount, umount};

[3.50]

[3.87]

use libc::{mount, umount, MS_BIND, MS_PRIVATE};

Replacement in src/extract.rs at line 1 [3.19587]

B:BD[3.19587] → [4.17158:17213]

use crate::{Client, Downloaded, Error, find_files::*};

[3.19587]

[3.19628]

use crate::{find_files::*, Client, Downloaded, Error};

Deletion in src/deb.rs at line 377 [3.37901]
B:BD[3.44534] → [3.44534:44555]
```
    IResult, Parser,
```
Insertion in src/deb.rs at line 380 [3.37901]
[3.44651]
[3.44651]
```
    IResult, Parser,
```
Replacement in src/deb/index.rs at line 1 [3.51880]
B:BD[3.51880] → [3.51881:51917]
```
use super::{Stanza, parse_control};
```
[3.51880]
[3.51933]
```
use super::{parse_control, Stanza};
```
Replacement in src/container.rs at line 1 [4.44692]
B:BD[4.44692] → [4.44693:44735]
```
use crate::{Error, find_files::*, mount};
```
[4.44692]
[4.44735]
```
use crate::{find_files::*, mount, Error};
```
Replacement in elpe/lib/dune at line 11 [3.62377]
B:BD[4.72883] → [4.72883:72940]
```
  pbrt
  ocaml-protoc-plugin
  tar
  tar.gz
  tar-unix))
```
[4.72883]
[3.62510]
```
  ocaml-protoc-plugin))
```

Replacement in elpe/dune-project at line 22 [3.62729]

B:BD[3.63041] → [4.73053:73140]

 (depends ocaml lwt grpc-lwt h2-lwt-unix pbrt ocaml-protoc-plugin protoc tar tar-unix)

[3.63041]

[3.63115]

 (depends ocaml lwt grpc-lwt h2-lwt-unix ocaml-protoc-plugin protoc)

Replacement in elfedit/src/lib.rs at line 183 [5.69]

B:BD[5.5590] → [6.103:140]

            Sht(u32::from_le(e.0.0))

[5.5590]

[5.5628]

            Sht(u32::from_le(e.0 .0))

Replacement in elfedit/src/lib.rs at line 185 [5.69]

B:BD[5.5670] → [6.141:178]

            Sht(u32::from_be(e.0.0))

[5.5670]

[7.212]

            Sht(u32::from_be(e.0 .0))

Replacement in elfedit/src/lib.rs at line 267 [5.69]

B:BD[7.1462] → [6.179:216]

            Pht(u32::from_le(e.0.0))

[7.1462]

[7.1500]

            Pht(u32::from_le(e.0 .0))

Replacement in elfedit/src/lib.rs at line 269 [5.69]

B:BD[7.1542] → [6.217:254]

            Pht(u32::from_be(e.0.0))

[7.1542]

[7.1580]

            Pht(u32::from_be(e.0 .0))

Replacement in elfedit/src/lib.rs at line 1872 [5.69]

B:BD[5.38493] → [5.38493:38569]

    pub fn needed(&self) -> impl Iterator<Item = Result<&'a CStr, Error>> {

[5.38493]

[5.38569]

    pub fn needed<'b>(&'b self) -> impl Iterator<Item = Result<&'a CStr, Error>> + 'b {

Replacement in elfedit/src/lib.rs at line 1969 [5.69]

B:BD[7.21866] → [6.6107:6160]

        DynTag32(EndianT::endian(Endian(e.0.0), id))

[7.21866]

[7.21920]

        DynTag32(EndianT::endian(Endian(e.0 .0), id))

Replacement in elfedit/src/lib.rs at line 1981 [5.69]

B:BD[7.22024] → [6.6161:6214]

        DynTag64(EndianT::endian(Endian(e.0.0), id))

[7.22024]

[5.41634]

        DynTag64(EndianT::endian(Endian(e.0 .0), id))

Replacement in elfedit/Cargo.toml at line 4 [5.46549]
B:BD[5.46595] → [5.46595:46612]
```
edition = "2024"
```
[5.46595]
[5.46612]
```
edition = "2021"
```

Replacement in default.nix at line 133 [3.64932]

B:BD[3.69791] → [3.69791:69896]

      propagatedBuildInputs = with pkgs; [
        ocamlPackages.ocaml-protoc
        ocamlPackages.pbrt

[3.69791]

[3.69896]

      buildInputs = with pkgs; [
        ocamlPackages.ocaml-protoc-plugin

Deletion in default.nix at line 136 [3.64932]
B:BD[3.69926] → [3.69926:69968]
B:BD[3.69968] → [4.78562:78595]
```
        ocamlPackages.ocaml-protoc-plugin
        tar
        tar-lwt-unix
```
Insertion in default.nix at line 138 [3.64932]
[3.70005]
[3.70005]
```
        protobuf
```

Replacement in default.nix at line 140 [3.64932]

B:BD[3.70014] → [3.70014:70042]

      nativeBuildInputs = [

[3.70014]

[3.70042]

      nativeBuildInputs = with pkgs; [
        ocamlPackages.ocaml-protoc-plugin

Insertion in default.nix at line 144 [3.64932]

[3.70068]

      propagatedBuildInputs = with pkgs; [
        ocaml
        ocamlPackages.ocaml-protoc-plugin
        ocamlPackages.findlib
        grpc-lwt
        h2-lwt-unix
      ];
      buildPhase = "dune build";
      postInstall = ''
        mkdir -p $out/bin
        cp _build/default/bin/elpe_bin.exe $out/bin/elpe
      '';

Insertion in default.nix at line 157 [3.64932]

[3.70075]


    elpe_rs = (pkgs.callPackage ./Cargo.nix {
      inherit pkgs;
      defaultCrateOverrides = pkgs.defaultCrateOverrides // {
        elpe = attrs: {
          nativeBuildInputs = [ pkgs.protobuf ];
          PROTOC="${protobuf}/bin/protoc";
        };
      };
    }).workspaceMembers.elpe.build.overrideAttrs (attrs: {
      postInstall = "mv $out/bin/elpe $out/bin/elpe-server";
    });

Replacement in default.nix at line 172 [3.64932]

B:BD[3.70122] → [3.70122:70205]

B:BD[3.70216] → [3.70216:70364]

B:BD[3.70364] → [4.78596:78672]

∅:D[4.78672] → [3.70364:70431]

B:BD[3.70364] → [3.70364:70431]

B:BD[3.70431] → [2.9485:9494]

∅:D[2.9494] → [3.70440:70646]

∅:D[4.78684] → [3.70440:70646]

B:BD[3.70440] → [3.70440:70646]

  buildInputs = [
    openssl nettle zstd.dev sequoia-sq
    xz.dev
    pkg-config
    ocaml
    opam
    ocamlPackages.ocaml
    ocamlPackages.dune_3
    ocamlPackages.ocaml-protoc
    ocamlPackages.pbrt
    ocamlPackages.findlib
    ocamlPackages.core
    ocamlPackages.core_unix
    tar
    tar-lwt-unix
    ocamlPackages.ocaml-protoc-plugin
    grpc-lwt
    h2-lwt-unix
    elpe
    ocamlformat
    protobuf
    checksec
    linuxPackages_latest.perf
  ];
  nativeBuildInputs = [pkg-config b3sum];
  LIBCLANG_PATH="${llvmPackages.libclang.lib}/lib";
  PROTOC="${protobuf}/bin/protoc";

[3.70122]

[3.70646]

  phases = [ "installPhase" "fixupPhase" ];
  propagatedBuildInputs = [ sequoia-sq elpe elpe_rs ];
  installPhase = "mkdir $out";

Replacement in Cargo.toml at line 4 [3.71016]
B:BD[3.71059] → [3.71059:71076]
```
edition = "2024"
```
[3.71059]
[3.71076]
```
edition = "2021"
```

Formatting, cleanup and Rust 2021 compatibility

Dependencies

In channels

Change contents

Replacement in src/mount.rs at line 1 [3.50]

Replacement in src/extract.rs at line 1 [3.19587]

Deletion in src/deb.rs at line 377 [3.37901]

Insertion in src/deb.rs at line 380 [3.37901]

Replacement in src/deb/index.rs at line 1 [3.51880]

Replacement in src/container.rs at line 1 [4.44692]

Replacement in elpe/lib/dune at line 11 [3.62377]