Merge pull request #930 from subspace/update-rust

Update Rust to the latest nightly, minor documentation and Docker tweaks
autonomys · Nov 17, 2022 · c080a1e · c080a1e
2 parents 2f2242e + 493da26
commit c080a1e
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 18 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,6 @@
 *
 !/crates
-!/cumulus
+!/domains
 !/orml
 !/substrate
 !/test

diff --git a/Dockerfile-bootstrap-node b/Dockerfile-bootstrap-node
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-bootstrap-node.aarch64 b/Dockerfile-bootstrap-node.aarch64
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-farmer b/Dockerfile-farmer
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-farmer.aarch64 b/Dockerfile-farmer.aarch64
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-node b/Dockerfile-node
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-node.aarch64 b/Dockerfile-node.aarch64
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/Dockerfile-runtime b/Dockerfile-runtime
@@ -1,6 +1,6 @@
 FROM ubuntu:20.04
 
-ARG RUSTC_VERSION=nightly-2022-11-08
+ARG RUSTC_VERSION=nightly-2022-11-16
 ARG PROFILE=production
 ARG RUSTFLAGS
 # Workaround for https://github.com/rust-lang/cargo/issues/10583

diff --git a/crates/sc-consensus-subspace/src/lib.rs b/crates/sc-consensus-subspace/src/lib.rs
@@ -16,7 +16,7 @@
 // along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 #![doc = include_str!("../README.md")]
-#![feature(drain_filter, int_log, try_blocks)]
+#![feature(drain_filter, try_blocks)]
 #![forbid(unsafe_code)]
 #![warn(missing_docs)]
 

diff --git a/crates/subspace-core-primitives/src/lib.rs b/crates/subspace-core-primitives/src/lib.rs
@@ -18,7 +18,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![warn(rust_2018_idioms, missing_docs)]
 #![cfg_attr(feature = "std", warn(missing_debug_implementations))]
-#![feature(int_log)]
 
 pub mod crypto;
 pub mod objects;

diff --git a/crates/subspace-farmer/src/lib.rs b/crates/subspace-farmer/src/lib.rs
@@ -2,7 +2,6 @@
     const_option,
     drain_filter,
     hash_drain_filter,
-    int_log,
     io_error_other,
     trait_alias,
     try_blocks,

diff --git a/crates/subspace-networking/src/create.rs b/crates/subspace-networking/src/create.rs
@@ -70,7 +70,7 @@ pub enum RelayMode {
     /// Client relay configuration (enables relay client behavior).
     /// It uses a circuit relay server address as a parameter.
     ///
-    /// Example: /memory/<port>/p2p/<server_peer_id>/p2p-circuit
+    /// Example: /memory/\<port>/p2p/\<server_peer_id>/p2p-circuit
     Client(Multiaddr),
 }
 

diff --git a/domains/client/domain-executor/src/lib.rs b/domains/client/domain-executor/src/lib.rs
@@ -24,13 +24,13 @@
 //! farmers. Please refer to the white paper [Computation section] for more in-depth description
 //! and analysis.
 //!
-//! Specifically, executors are responsible for producing a [`Bundle`] on each slot from
+//! Specifically, executors are responsible for producing a [`SignedBundle`] on each slot from
 //! the primary chain and producing an [`ExecutionReceipt`] on each primary block.
 //!
 //! On each new primary chain slot, executors will collect a set of extrinsics from the transaction
 //! pool which are verified to be able to cover the transaction fee, and then use these extrinsics
-//! to create a [`Bundle`], submitting it to the primary chain. The submitted bundles are mere blob
-//! from the point of primary chain.
+//! to create a [`SignedBundle`], submitting it to the primary chain. The submitted bundles are mere
+//! blob from the point of primary chain.
 //!
 //! On each imported primary block, executors will extract all the bundles from the primary block and
 //! convert the bundles to a list of extrinsics, construct a custom [`BlockBuilder`] to build a secondary

diff --git a/orml/vesting/src/lib.rs b/orml/vesting/src/lib.rs
@@ -177,7 +177,7 @@ pub mod module {
 
 	/// Vesting schedules of an account.
 	///
-	/// VestingSchedules: map AccountId => Vec<VestingSchedule>
+	/// VestingSchedules: map AccountId => Vec\<VestingSchedule>
 	#[pallet::storage]
 	#[pallet::getter(fn vesting_schedules)]
 	pub type VestingSchedules<T: Config> = StorageMap<

diff --git a/orml/vesting/src/weights.rs b/orml/vesting/src/weights.rs
@@ -1,7 +1,7 @@
 //! Autogenerated weights for orml_vesting
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 3.0.0
-//! DATE: 2021-05-04, STEPS: [50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
+//! DATE: 2021-05-04, STEPS: \[50, ], REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
 //! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 128
 
 // Executed Command:

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "nightly-2022-11-08"
+channel = "nightly-2022-11-16"
 components = ["rust-src"]
 targets = ["wasm32-unknown-unknown"]
 profile = "default"