Merge pull request #365 from thomastaylor312/chore/version_bump

chore(*): Bumps version to 0.9.0
deislabs · Feb 2, 2023 · f8d20c5 · f8d20c5
2 parents e133e19 + 5001063
commit f8d20c5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bindle"
-version = "0.9.0-rc.2"
+version = "0.9.0"
 authors = [
  "Matt Butcher <[email protected]>",
  "Taylor Thomas <[email protected]>"

diff --git a/examples/as2bindle.rs b/examples/as2bindle.rs
@@ -79,7 +79,7 @@ async fn main() {
  name: format!("{}", path.file_name().unwrap().to_string_lossy()),
  media_type: "application/wasm".to_owned(),
  sha256: sha,
- size: md.len() as u64,
+ size: md.len(),
  ..bindle::Label::default()
  };
 

diff --git a/examples/cargo2bindle.rs b/examples/cargo2bindle.rs
@@ -104,7 +104,7 @@ async fn main() {
  name: format!("{}", path.file_name().unwrap().to_string_lossy()),
  media_type: "application/wasm".to_owned(),
  sha256: sha,
- size: md.len() as u64,
+ size: md.len(),
  ..bindle::Label::default()
  };
 

diff --git a/src/cache/lru.rs b/src/cache/lru.rs
@@ -313,8 +313,7 @@ mod test {
  *count += 1;
  let info = scaffold
  .parcel_files
- .into_iter()
- .map(|(_, info)| info)
+ .into_values()
  .find(|info| info.sha == parcel_id)
  .expect("Unable to find parcel");
  Ok(Box::new(

diff --git a/src/server/routes.rs b/src/server/routes.rs
@@ -14,7 +14,7 @@ pub fn api<P, I, Authn, Authz, S>(
  secret_store: S,
  verification_strategy: crate::VerificationStrategy,
  keyring: KeyRing,
-) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
 where
  P: crate::provider::Provider + Clone + Send + Sync + 'static,
  I: crate::search::Search + Clone + Send + Sync + 'static,
@@ -98,7 +98,7 @@ pub mod v1 {
  provider_client_id: String,
  device_auth_url: String,
  token_url: String,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone {
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
  warp::path("login")
  .and(warp::get())
  .and(warp::query::<LoginParams>())
@@ -123,7 +123,7 @@ pub mod v1 {
 
  pub fn query<S>(
  index: S,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  S: Search + Clone + Send + Sync,
  {
@@ -140,7 +140,7 @@ pub mod v1 {
  secret_store: S,
  verification_strategy: crate::VerificationStrategy,
  keyring: Arc<KeyRing>,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  S: SecretKeyStorage + Clone + Send + Sync,
@@ -162,7 +162,7 @@ pub mod v1 {
  secret_store: S,
  verification_strategy: crate::VerificationStrategy,
  keyring: Arc<KeyRing>,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  S: SecretKeyStorage + Clone + Send + Sync,
@@ -183,7 +183,7 @@ pub mod v1 {
  // The GET and HEAD endpoints handle both parcels and invoices through the request router function
  pub fn get<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -197,7 +197,7 @@ pub mod v1 {
 
  pub fn head<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -211,7 +211,7 @@ pub mod v1 {
 
  pub fn yank<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -229,7 +229,7 @@ pub mod v1 {
 
  pub fn create<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -243,7 +243,7 @@ pub mod v1 {
 
  pub fn get<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -255,7 +255,7 @@ pub mod v1 {
 
  pub fn head<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -271,7 +271,7 @@ pub mod v1 {
 
  pub fn get_missing_parcels<P>(
  store: P,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  P: Provider + Clone + Send + Sync,
  {
@@ -294,7 +294,7 @@ pub mod v1 {
 
  pub fn host_keys<S>(
  secret_store: S,
- ) -> impl Filter<Extract = impl warp::Reply, Error = warp::Rejection> + Clone
+ ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone
  where
  S: SecretKeyStorage + Clone + Send + Sync,
  {

diff --git a/tests/standalone.rs b/tests/standalone.rs
@@ -29,8 +29,8 @@ async fn test_successful_write() {
  scaffold.invoice,
  scaffold
  .parcel_files
- .into_iter()
- .map(|(_, parcel)| (parcel.sha, Cursor::new(parcel.data)))
+ .into_values()
+ .map(|parcel| (parcel.sha, Cursor::new(parcel.data)))
  .collect(),
  )
  .await
@@ -55,8 +55,8 @@ async fn test_successful_write_stream() {
 
  let parcels = scaffold
  .parcel_files
- .into_iter()
- .map(|(_, parcel)| {
+ .into_values()
+ .map(|parcel| {
  (
  parcel.sha,
  FramedRead::new(std::io::Cursor::new(parcel.data), BytesCodec::default())
@@ -134,8 +134,8 @@ async fn test_invalid_standalone_write() {
 
  let mut parcels: HashMap<String, Cursor<Vec<u8>>> = scaffold
  .parcel_files
- .into_iter()
- .map(|(_, parcel)| (parcel.sha, Cursor::new(parcel.data)))
+ .into_values()
+ .map(|parcel| (parcel.sha, Cursor::new(parcel.data)))
  .collect();
 
  parcels.insert(