Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e8f0bfabd4a0
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 16d8b612cb0c
Choose a head ref
  • 1 commit
  • 5 files changed
  • 1 contributor

Commits on May 25, 2020

  1. Revert "lapin: 1.0.0-beta4 -> 1.0.0-rc6" 

    This reverts commit 69c0fbb.
    @LnL7 @cole-h
    LnL7 authored and cole-h committed May 25, 2020
    Copy the full SHA
    16d8b61 View commit details
Showing with 57 additions and 118 deletions.
  1. +24 −42 Cargo.lock
  2. +17 −63 Cargo.nix
  3. +1 −1 ofborg/Cargo.toml
  4. +11 −9 ofborg/src/easylapin.rs
  5. +4 −3 ofborg/src/stats.rs
66 changes: 24 additions & 42 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

80 changes: 17 additions & 63 deletions Cargo.nix
View file
Original file line number Diff line number Diff line change
@@ -119,9 +119,9 @@ rec {
};
"amq-protocol" = rec {
crateName = "amq-protocol";
version = "6.0.0-rc7";
version = "6.0.0-rc3";
edition = "2018";
sha256 = "06ys8l0qd031z26nprhsqmq6skwals2ylpav3kgkvbk0d5gwy1zi";
sha256 = "0v9x190dzgjviw9nj86grsxws7v5isws75ni6hiiff2pn6qg6apw";
libName = "amq_protocol";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -171,9 +171,9 @@ rec {
};
"amq-protocol-codegen" = rec {
crateName = "amq-protocol-codegen";
version = "6.0.0-rc7";
version = "6.0.0-rc3";
edition = "2018";
sha256 = "0di623y8pcpw15zhkckbca480qg99ih2lsqqjnlgm1b13n4sfl8z";
sha256 = "1whm4cazcyhsc6zzaqwsbkr0ra3cwwfp9jsn2vn5rs1ql5qc7wn3";
libName = "amq_protocol_codegen";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -201,9 +201,9 @@ rec {
};
"amq-protocol-tcp" = rec {
crateName = "amq-protocol-tcp";
version = "6.0.0-rc7";
version = "6.0.0-rc3";
edition = "2018";
sha256 = "11yq8589vi0kcr1rivc97r9sm75g7jhrb58j7dppgd1875v6225n";
sha256 = "1xrp17gljcdxqak7n51w95c419jldacq9gqss1rwpfgrfmwl0y5w";
libName = "amq_protocol_tcp";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -237,9 +237,9 @@ rec {
};
"amq-protocol-types" = rec {
crateName = "amq-protocol-types";
version = "6.0.0-rc7";
version = "6.0.0-rc3";
edition = "2018";
sha256 = "15dsxydv32g3j9sf0mfpqi8sa85ma3m5vwv2yi1hq80nd61w1qh0";
sha256 = "0pqk3xqaggwd400l0nyjbc7vqn9dvnah7bmb688vz6h6lqmyh9a4";
libName = "amq_protocol_types";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -270,9 +270,9 @@ rec {
};
"amq-protocol-uri" = rec {
crateName = "amq-protocol-uri";
version = "6.0.0-rc7";
version = "6.0.0-rc3";
edition = "2018";
sha256 = "05fj5an4ixfgl7kh4vf55xaa2v6grj6bpxcf4wqx4klff11172bv";
sha256 = "1r57v1i9wy5wr22bc6kfyz22lbhifarlbss415gq40lcwidvjlcm";
libName = "amq_protocol_uri";
authors = [
"Marc-Antoine Perennou <%arc-Antoine@Perennou.com>"
@@ -529,20 +529,6 @@ rec {
];

};
"base64 0.11.0" = rec {
crateName = "base64";
version = "0.11.0";
edition = "2018";
sha256 = "1iqmims6yvr6vwzyy54qd672zw29ipjj17p8klcr578c9ajpw6xl";
authors = [
"Alice Maz <alice@alicemaz.com>"
"Marshall Pierce <marshall@mpierce.org>"
];
features = {
"default" = [ "std" ];
};
resolvedDefaultFeatures = [ "default" "std" ];
};
"base64 0.9.3" = rec {
crateName = "base64";
version = "0.9.3";
@@ -1761,9 +1747,9 @@ rec {
};
"lapin" = rec {
crateName = "lapin";
version = "1.0.0-rc6";
version = "1.0.0-beta4";
edition = "2018";
sha256 = "1qq5225w13ybivv2rdwzfa02ghdh19ckmjays9zxxjd5n2h1kk3g";
sha256 = "1hw2wh4fpzrdynhb6xyc7yiyhc2msqz0z1mqhvwq6mli0bxyvkns";
authors = [
"Geoffroy Couprie <geo.couprie@gmail.com>"
"Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"
@@ -2753,30 +2739,6 @@ rec {
"deadlock_detection" = [ "petgraph" "thread-id" "backtrace" ];
};
};
"pem" = rec {
crateName = "pem";
version = "0.7.0";
edition = "2018";
sha256 = "14wpql0znpxrg6bq6lmp9kvbs9v24l0zzqqf3yj5d9spqxh1fn51";
authors = [
"Jonathan Creekmore <jonathan@thecreekmores.org>"
];
dependencies = [
{
name = "base64";
packageId = "base64 0.11.0";
}
{
name = "lazy_static";
packageId = "lazy_static";
}
{
name = "regex";
packageId = "regex";
}
];

};
"percent-encoding 1.0.1" = rec {
crateName = "percent-encoding";
version = "1.0.1";
@@ -3962,9 +3924,9 @@ rec {
};
"tcp-stream" = rec {
crateName = "tcp-stream";
version = "0.19.1";
version = "0.15.4";
edition = "2018";
sha256 = "0gihcjbkl1bfakq9cphbf54i2z30rb1jsjvm1bjm6fy8dyk3dy9v";
sha256 = "1pfrlryb4fydq4rdvmljnd01k7i3kqadlydsz5ifgsm7yrvs5yng";
libName = "tcp_stream";
authors = [
"Marc-Antoine Perennou <Marc-Antoine@Perennou.com>"
@@ -3983,27 +3945,19 @@ rec {
{
name = "native-tls";
packageId = "native-tls";
rename = "native-tls-crate";
optional = true;
}
{
name = "pem";
packageId = "pem";
optional = true;
}
];
features = {
"dangerous-configuration" = [ "rustls-connector/dangerous-configuration" ];
"default" = [ "native-tls" ];
"native-tls" = [ "native-tls-crate" "pem" ];
"quic" = [ "rustls-connector/quic" ];
"rustls" = [ "rustls-native-certs" ];
"rustls-common" = [ "rustls-connector" "p12" ];
"rustls-native-certs" = [ "rustls-common" "rustls-connector/native-certs" ];
"rustls-webpki-roots-certs" = [ "rustls-common" "rustls-connector/webpki-roots-certs" ];
"rustls-native-certs" = [ "rustls-connector" "rustls-connector/native-certs" ];
"rustls-webpki-roots-certs" = [ "rustls-connector" "rustls-connector/webpki-roots-certs" ];
"vendored-openssl" = [ "openssl/vendored" ];
};
resolvedDefaultFeatures = [ "native-tls" "native-tls-crate" "pem" ];
resolvedDefaultFeatures = [ "native-tls" ];
};
"tempfile 2.2.0" = rec {
crateName = "tempfile";
2 changes: 1 addition & 1 deletion ofborg/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -27,4 +27,4 @@ chrono = "0.4.6"
separator = "0.4.1"

async-std = "1.5.0"
lapin = "1.0.0-rc6"
lapin = "=1.0.0-beta4"
Loading