Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rust 1.76 compilation updates #3781

Merged
merged 1 commit into from
Feb 16, 2024
Merged

Rust 1.76 compilation updates #3781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
850 changes: 489 additions & 361 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -24,31 +24,31 @@ blake2-rfc = "0.2"
chrono = "0.4.11"
clap = { version = "2.33", features = ["yaml"] }
ctrlc = { version = "3.1", features = ["termination"] }
cursive_table_view = "0.13.2"
cursive_table_view = "0.14"
humansize = "1.1.0"
serde = "1"
futures = "0.3.19"
serde_json = "1"
log = "0.4"
term = "0.6"

grin_api = { path = "./api", version = "5.2.0" }
grin_config = { path = "./config", version = "5.2.0" }
grin_chain = { path = "./chain", version = "5.2.0" }
grin_core = { path = "./core", version = "5.2.0" }
grin_keychain = { path = "./keychain", version = "5.2.0" }
grin_p2p = { path = "./p2p", version = "5.2.0" }
grin_servers = { path = "./servers", version = "5.2.0" }
grin_util = { path = "./util", version = "5.2.0" }
grin_api = { path = "./api", version = "5.2.1-beta.1" }
grin_config = { path = "./config", version = "5.2.1-beta.1" }
grin_chain = { path = "./chain", version = "5.2.1-beta.1" }
grin_core = { path = "./core", version = "5.2.1-beta.1" }
grin_keychain = { path = "./keychain", version = "5.2.1-beta.1" }
grin_p2p = { path = "./p2p", version = "5.2.1-beta.1" }
grin_servers = { path = "./servers", version = "5.2.1-beta.1" }
grin_util = { path = "./util", version = "5.2.1-beta.1" }

[dependencies.cursive]
version = "0.16"
version = "0.17"
default-features = false
features = ["pancurses-backend"]

[build-dependencies]
built = { version = "0.4", features = ["git2"]}

[dev-dependencies]
grin_chain = { path = "./chain", version = "5.2.0" }
grin_store = { path = "./store", version = "5.2.0" }
grin_chain = { path = "./chain", version = "5.2.1-beta.1" }
grin_store = { path = "./store", version = "5.2.1-beta.1" }
14 changes: 7 additions & 7 deletions api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_api"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -30,9 +30,9 @@ rustls = "0.17"
url = "2.1"
bytes = "0.5"

grin_core = { path = "../core", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
10 changes: 5 additions & 5 deletions chain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_chain"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -23,10 +23,10 @@ chrono = "0.4.11"
lru-cache = "0.1"
lazy_static = "1"

grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

[dev-dependencies]
env_logger = "0.7"
Expand Down
10 changes: 5 additions & 5 deletions config/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_config"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Configuration for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -16,10 +16,10 @@ serde_derive = "1"
toml = "0.5"
dirs = "2.0"

grin_core = { path = "../core", version = "5.2.0" }
grin_servers = { path = "../servers", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_servers = { path = "../servers", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

[dev-dependencies]
pretty_assertions = "0.6.1"
6 changes: 3 additions & 3 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_core"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down Expand Up @@ -28,8 +28,8 @@ chrono = { version = "0.4.11", features = ["serde"] }
zeroize = { version = "1.1", features =["zeroize_derive"] }
bytes = "0.5"

keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.0" }
util = { package = "grin_util", path = "../util", version = "5.2.0" }
keychain = { package = "grin_keychain", path = "../keychain", version = "5.2.1-beta.1" }
util = { package = "grin_util", path = "../util", version = "5.2.1-beta.1" }

[dev-dependencies]
serde_json = "1"
4 changes: 2 additions & 2 deletions keychain/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_keychain"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -26,4 +26,4 @@ ripemd160 = "0.9"
sha2 = "0.9"
pbkdf2 = "0.8"

grin_util = { path = "../util", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
12 changes: 6 additions & 6 deletions p2p/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_p2p"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -22,10 +22,10 @@ log = "0.4"
chrono = { version = "0.4.11", features = ["serde"] }
bytes = "0.5"

grin_core = { path = "../core", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }

[dev-dependencies]
grin_pool = { path = "../pool", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }
10 changes: 5 additions & 5 deletions pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_pool"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -18,9 +18,9 @@ thiserror = "1"
log = "0.4"
chrono = "0.4.11"

grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

[dev-dependencies]
grin_chain = { path = "../chain", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
18 changes: 9 additions & 9 deletions servers/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_servers"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -26,11 +26,11 @@ tokio = {version = "0.2", features = ["full"] }
tokio-util = { version = "0.2", features = ["codec"] }
walkdir = "2.3.1"

grin_api = { path = "../api", version = "5.2.0" }
grin_chain = { path = "../chain", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.0" }
grin_keychain = { path = "../keychain", version = "5.2.0" }
grin_p2p = { path = "../p2p", version = "5.2.0" }
grin_pool = { path = "../pool", version = "5.2.0" }
grin_store = { path = "../store", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_api = { path = "../api", version = "5.2.1-beta.1" }
grin_chain = { path = "../chain", version = "5.2.1-beta.1" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_keychain = { path = "../keychain", version = "5.2.1-beta.1" }
grin_p2p = { path = "../p2p", version = "5.2.1-beta.1" }
grin_pool = { path = "../pool", version = "5.2.1-beta.1" }
grin_store = { path = "../store", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }
2 changes: 1 addition & 1 deletion src/bin/tui/logs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

use cursive::theme::{BaseColor, Color, ColorStyle};
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::ResizedView;
use cursive::{Cursive, Printer};
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tui/menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
use cursive::align::HAlign;
use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::view::Identifiable;
use cursive::view::Nameable;
use cursive::view::View;
use cursive::views::{
LinearLayout, OnEventView, ResizedView, SelectView, StackView, TextView, ViewRef,
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tui/mining.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use std::cmp::Ordering;
use chrono::prelude::{DateTime, NaiveDateTime, Utc};
use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::traits::{Boxable, Identifiable};
use cursive::traits::{Nameable, Resizable};
use cursive::view::View;
use cursive::views::{
Button, Dialog, LinearLayout, OnEventView, Panel, ResizedView, StackView, TextView,
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tui/peers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use humansize::{file_size_opts::CONVENTIONAL, FileSize};

use cursive::direction::Orientation;
use cursive::event::Key;
use cursive::traits::{Boxable, Identifiable};
use cursive::traits::{Nameable, Resizable};
use cursive::view::View;
use cursive::views::{Dialog, LinearLayout, OnEventView, ResizedView, TextView};
use cursive::Cursive;
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tui/status.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

use chrono::prelude::Utc;
use cursive::direction::Orientation;
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::{LinearLayout, ResizedView, TextView};
use cursive::Cursive;
Expand Down
7 changes: 2 additions & 5 deletions src/bin/tui/ui.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ use cursive::theme::PaletteColor::{
Background, Highlight, HighlightInactive, Primary, Shadow, View,
};
use cursive::theme::{BaseColor, BorderStyle, Color, Theme};
use cursive::traits::Boxable;
use cursive::traits::Identifiable;
use cursive::traits::{Nameable, Resizable};
use cursive::utils::markup::StyledString;
use cursive::views::{
CircularFocus, Dialog, LinearLayout, Panel, SelectView, StackView, TextView, ViewRef,
Expand Down Expand Up @@ -124,9 +123,7 @@ impl UI {
let controller_tx_clone = grin_ui.controller_tx.clone();
grin_ui.cursive.add_global_callback('q', move |c| {
let content = StyledString::styled("Shutting down...", Color::Light(BaseColor::Yellow));
c.add_layer(CircularFocus::wrap_tab(Dialog::around(TextView::new(
content,
))));
c.add_layer(CircularFocus::new(Dialog::around(TextView::new(content))).wrap_tab());
controller_tx_clone
.send(ControllerMessage::Shutdown)
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion src/bin/tui/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
//! Version and build info
use cursive::direction::Orientation;
use cursive::traits::Identifiable;
use cursive::traits::Nameable;
use cursive::view::View;
use cursive::views::{LinearLayout, ResizedView, TextView};

Expand Down
6 changes: 3 additions & 3 deletions store/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_store"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand All @@ -21,8 +21,8 @@ serde_derive = "1"
thiserror = "1"
log = "0.4"

grin_core = { path = "../core", version = "5.2.0" }
grin_util = { path = "../util", version = "5.2.0" }
grin_core = { path = "../core", version = "5.2.1-beta.1" }
grin_util = { path = "../util", version = "5.2.1-beta.1" }

[dev-dependencies]
chrono = "0.4.11"
Expand Down
2 changes: 1 addition & 1 deletion util/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "grin_util"
version = "5.2.0"
version = "5.2.1-beta.1"
authors = ["Grin Developers <[email protected]>"]
description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
license = "Apache-2.0"
Expand Down