Bump serde_yaml, add compat. for old lockfiles

pulp-platform · Aug 17, 2022 · e712e4d · e712e4d
1 parent f82ef0e
commit e712e4d
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           - stable
           - beta
           - nightly
-          - 1.57.0 # minimum supported version
+          - 1.58.0 # minimum supported version
     continue-on-error: ${{ matrix.rust == 'nightly' }}
     steps:
       - uses: actions/checkout@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 ## Unreleased
 
 ### Changed
-- Update `tokio` dependency, update to `futures=0.3`, rewrite for `async/await`
+- Update `tokio` dependency, update to `futures=0.3`, rewrite for `async/await`. Bumps minimum rust to 1.57
+- Update `serde_yaml` dependency to `0.9`. Bumps minimum rust to 1.58
 
 ## 0.25.3 - 2022-08-05
 ### Added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,9 +9,8 @@ license = "Apache-2.0 OR MIT"
 edition = "2018"
 
 [dependencies]
-serde = "1"
-serde_derive = "1"
-serde_yaml = "0.8.4"
+serde = { version = "1", features = ["derive"] }
+serde_yaml = "0.9.9"
 serde_json = "1"
 
 futures = "0.3"

diff --git a/src/config.rs b/src/config.rs
@@ -738,6 +738,7 @@ pub struct LockedPackage {
     /// The version of the dependency.
     pub version: Option<String>,
     /// The source of the dependency.
+    #[serde(with = "serde_yaml::with::singleton_map")]
     pub source: LockedSource,
     /// Other packages this package depends on.
     pub dependencies: BTreeSet<String>,

diff --git a/src/main.rs b/src/main.rs
@@ -4,7 +4,6 @@
 #![allow(dead_code)]
 
 #[macro_use]
-extern crate serde_derive;
 extern crate serde;
 extern crate serde_json;
 extern crate serde_yaml;