minor fix and bump rust version

constellation-rs · Oct 7, 2019 · 60c489d · 60c489d
1 parent 746672f
commit 60c489d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -14,7 +14,7 @@ jobs:
     endpoint: alecmocatta
     default:
       rust_toolchain: nightly
-      rust_lint_toolchain: nightly-2019-09-13
+      rust_lint_toolchain: nightly-2019-10-04
       rust_flags: ''
       rust_features: 'no_alloc;no_alloc distribute_binaries'
       rust_target_check: ''

diff --git a/constellation-internal/src/msg.rs b/constellation-internal/src/msg.rs
@@ -312,9 +312,10 @@ mod serde {
 				.ok_or_else(|| de::Error::invalid_length(5, &self))?
 				.into_vec();
 			let binary = seq
-				.next_element::<serde_bytes::ByteBuf>()?
-				.ok_or_else(|| de::Error::invalid_length(6, &self))?
-				.into_vec();
+				.next_element()?
+				.ok_or_else(|| de::Error::invalid_length(6, &self))?;
+			#[cfg(feature = "distribute_binaries")]
+			let binary = serde_bytes::ByteBuf::into_vec(binary);
 			Ok(FabricRequest {
 				block,
 				resources,
@@ -360,9 +361,10 @@ mod serde {
 				.ok_or_else(|| de::Error::invalid_length(3, &self))?
 				.into_vec();
 			let binary = seq
-				.next_element::<serde_bytes::ByteBuf>()?
-				.ok_or_else(|| de::Error::invalid_length(4, &self))?
-				.into_vec();
+				.next_element()?
+				.ok_or_else(|| de::Error::invalid_length(4, &self))?;
+			#[cfg(feature = "distribute_binaries")]
+			let binary = serde_bytes::ByteBuf::into_vec(binary);
 			Ok(BridgeRequest {
 				resources,
 				args,

diff --git a/src/bin/constellation/main.rs b/src/bin/constellation/main.rs
@@ -51,7 +51,6 @@
 //! cargo deploy 10.0.0.1:8888
 //! ```
 
-#![feature(param_attrs)]
 #![warn(
 	// missing_copy_implementations,
 	missing_debug_implementations,