Core/grin-wallet
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin-wallet.git synced 2025-01-20 19:11:09 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

[MASTER] Updates for Rust 1.80+ (#722)

Browse source 
* warning fixes

* warning cleanup
This commit is contained in:
Yeastplume 2024-09-19 10:51:10 +01:00 committed by GitHub
parent 7ac35f134b
commit b7104cd654
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 384 additions and 405 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.cargo/config
View file

@ -1,4 +0,0 @@
[target.x86_64-pc-windows-msvc]
rustflags = ["-Ctarget-feature=+crt-static"]
[target.i686-pc-windows-msvc]
rustflags = ["-Ctarget-feature=+crt-static"]

775
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

2
Cargo.toml
View file

@ -68,7 +68,7 @@ grin_api = { git = "https://github.com/mimblewimble/grin", branch = "master" }
###### ######
[build-dependencies] [build-dependencies]
built = { version = "0.4", features = ["git2"]} built = { version = "0.7", features = ["git2"]}
[dev-dependencies] [dev-dependencies]
url = "2.1" url = "2.1"

2
impls/src/adapters/mod.rs
View file

@ -17,7 +17,7 @@ pub mod http;
mod slatepack; mod slatepack;
pub use self::file::PathToSlate; pub use self::file::PathToSlate;
pub use self::http::{HttpSlateSender, SchemeNotHttp}; pub use self::http::HttpSlateSender;
pub use self::slatepack::PathToSlatepack; pub use self::slatepack::PathToSlatepack;
use crate::config::WalletConfig; use crate::config::WalletConfig;

1
impls/src/node_clients/resp_types.rs
View file

@ -15,6 +15,7 @@
//! JSON RPC Types for V2 node client //! JSON RPC Types for V2 node client
#[allow(dead_code)]
#[derive(Debug, Deserialize)] #[derive(Debug, Deserialize)]
pub struct GetTipResp { pub struct GetTipResp {
pub height: u64, pub height: u64,

5
src/build/build.rs
View file

@ -39,13 +39,10 @@ fn main() {
} }
// build and versioning information // build and versioning information
let mut opts = built::Options::default();
opts.set_dependencies(true);
let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs"); let out_dir_path = format!("{}{}", env::var("OUT_DIR").unwrap(), "/built.rs");
// don't fail the build if something's missing, may just be cargo release // don't fail the build if something's missing, may just be cargo release
let _ = built::write_built_file_with_opts( let _ = built::write_built_file_with_opts(
&opts, Some(Path::new(env!("CARGO_MANIFEST_DIR"))),
Path::new(env!("CARGO_MANIFEST_DIR")),
Path::new(&out_dir_path), Path::new(&out_dir_path),
); );
} }