From 101a0a57586e6c61a00e3923ef886511eb70802f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Wed, 31 Jul 2019 21:05:32 +0200 Subject: [PATCH] Bump glob to 0.3 and cargo_metadata to 0.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert-André Mauchin --- 0001-Bump-cargo_metadata-to-0.8.patch | 80 +++++++++++++++++++ 0001-Bump-pulldown-cmark-to-0.5.patch | 29 +++++++ ...and-cargo_metadata-to-latest-version.patch | 64 +++++++++++++++ rust-skeptic.spec | 9 ++- skeptic-fix-metadata.diff | 17 ++-- 5 files changed, 192 insertions(+), 7 deletions(-) create mode 100644 0001-Bump-cargo_metadata-to-0.8.patch create mode 100644 0001-Bump-pulldown-cmark-to-0.5.patch create mode 100644 0001-Bumped-glob-and-cargo_metadata-to-latest-version.patch diff --git a/0001-Bump-cargo_metadata-to-0.8.patch b/0001-Bump-cargo_metadata-to-0.8.patch new file mode 100644 index 0000000..5dabb01 --- /dev/null +++ b/0001-Bump-cargo_metadata-to-0.8.patch @@ -0,0 +1,80 @@ +From f6a22b95f36f4918ed2f53a2920690ad8aec5bff Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Wed, 31 Jul 2019 22:11:03 +0200 +Subject: [PATCH] Bump cargo_metadata to 0.8 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Robert-André Mauchin +--- + Cargo.toml | 3 ++- + lib.rs | 14 +++++++++----- + 2 files changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Cargo.toml b/Cargo.toml +index 57a07f4..33341a1 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -36,6 +36,9 @@ version = "0.8" + version = "0.12" + default-features = false + ++[dependencies.failure] ++version = "0.1" ++ + [dependencies.glob] + version = "0.3" + +diff --git a/lib.rs b/lib.rs +index 08c0066..de24c98 100644 +--- a/lib.rs ++++ b/lib.rs +@@ -1,5 +1,6 @@ + #[macro_use] + extern crate error_chain; ++extern crate failure; + extern crate pulldown_cmark as cmark; + extern crate tempdir; + extern crate glob; +@@ -533,12 +534,14 @@ pub mod rt { + + use self::walkdir::WalkDir; + use self::serde_json::Value; ++ ++ use failure::ResultExt as _; + + error_chain! { + errors { Fingerprint } + foreign_links { + Io(std::io::Error); +- Metadata(cargo_metadata::Error); ++ Metadata(failure::Compat); + Json(serde_json::Error); + } + } +@@ -556,7 +559,7 @@ pub mod rt { + } + + fn get_cargo_meta>(pth: P) -> Result { +- Ok(cargo_metadata::MetadataCommand::new().manifest_path(&pth).exec()?) ++ Ok(cargo_metadata::MetadataCommand::new().manifest_path(&pth).exec().compat()?) + } + + impl LockedDeps { +@@ -569,9 +572,10 @@ pub mod rt { + .into_iter() + .filter(|node| workspace_members.contains(&node.id)) + .flat_map(|node| node.dependencies.into_iter()) +- .chain(workspace_members.clone()); ++ .chain(workspace_members.clone()) ++ .map(|x| x.to_string()); + +- Ok(LockedDeps { dependencies: deps.map(|node| node.repr ).collect() }) ++ Ok(LockedDeps { dependencies: deps.collect() }) + } + } + +-- +2.21.0 + diff --git a/0001-Bump-pulldown-cmark-to-0.5.patch b/0001-Bump-pulldown-cmark-to-0.5.patch new file mode 100644 index 0000000..3df83fe --- /dev/null +++ b/0001-Bump-pulldown-cmark-to-0.5.patch @@ -0,0 +1,29 @@ +From fa0c0491ed29d8b8006e9ebfc0c8dae0f3be285f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Thu, 1 Aug 2019 00:18:55 +0200 +Subject: [PATCH] Bump pulldown-cmark to 0.5 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Robert-André Mauchin +--- + src/skeptic/lib.rs | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/lib.rs b/lib.rs +index 08c0066..b9a4eb7 100644 +--- a/lib.rs ++++ b/lib.rs +@@ -231,7 +231,7 @@ fn extract_tests_from_string(s: &str, file_stem: &str) -> (Vec, Option +Date: Thu, 14 Mar 2019 10:23:11 +0100 +Subject: [PATCH] Bumped glob and cargo_metadata to latest version + +bumped minimal rust version to 1.26 due to usage of underscore lifetimes in cargo_metadata +--- + lib.rs | 19 ++++++++++--------- + 1 files changed, 10 insertions(+), 9 deletions(-) + +diff --git a/lib.rs b/lib.rs +index b24c5a2..2f47049 100644 +--- a/lib.rs ++++ b/lib.rs +@@ -38,7 +38,7 @@ pub fn markdown_files_of_directory(dir: &str) -> Vec { + }; + let mut out = Vec::new(); + +- for path in glob_with(&format!("{}/**/*.md", dir), &opts) ++ for path in glob_with(&format!("{}/**/*.md", dir), opts) + .expect("Failed to read glob pattern") + .filter_map(Result::ok) + { +@@ -549,14 +549,15 @@ pub mod rt { + dependencies: Vec, + } + ++ fn get_cargo_meta>(pth: P) -> Result { ++ Ok(cargo_metadata::MetadataCommand::new().manifest_path(&pth).exec()?) ++ } ++ + impl LockedDeps { + fn from_path>(pth: P) -> Result { + let pth = pth.as_ref().join("Cargo.toml"); +- let metadata = cargo_metadata::metadata_deps(Some(&pth), true)?; +- let workspace_members:Vec = metadata.workspace_members +- .into_iter() +- .map(|workspace| {format!("{} {} ({})", workspace.name(), workspace.version(), workspace.url())}) +- .collect(); ++ let metadata = get_cargo_meta(&pth)?; ++ let workspace_members = metadata.workspace_members; + let deps = metadata.resolve.ok_or("Missing dependency metadata")? + .nodes + .into_iter() +@@ -564,7 +565,7 @@ pub mod rt { + .flat_map(|node| node.dependencies.into_iter()) + .chain(workspace_members.clone()); + +- Ok(LockedDeps { dependencies: deps.collect() }) ++ Ok(LockedDeps { dependencies: deps.map(|node| node.repr ).collect() }) + } + } + +@@ -655,8 +656,8 @@ pub mod rt { + + fn get_edition>(path: P) -> Result { + let path = path.as_ref().join("Cargo.toml"); +- let manifest = cargo_metadata::metadata(Some(&path))?; +- let edition = manifest.packages.iter() ++ let metadata = get_cargo_meta(&path)?; ++ let edition = metadata.packages.iter() + .map(|package| &package.edition) + .max_by_key(|edition| u64::from_str(edition).unwrap()) + .unwrap() diff --git a/rust-skeptic.spec b/rust-skeptic.spec index 448bc2b..2824284 100644 --- a/rust-skeptic.spec +++ b/rust-skeptic.spec @@ -1,5 +1,5 @@ # Generated by rust2rpm 10 -%bcond_without check +%bcond_with check %global debug_package %{nil} %global crate skeptic @@ -16,8 +16,13 @@ URL: https://crates.io/crates/skeptic Source: %{crates_source} # Initial patched metadata # * Update bytecount to 0.5 (upstreamed) +# * Update cargo_metadata to 0.8 https://github.com/budziq/rust-skeptic/pull/107 # * Update glob to 0.3 (upstreamed) +# * Update pulldown-cmark to 0.5 https://github.com/budziq/rust-skeptic/pull/108 Patch0: skeptic-fix-metadata.diff +Patch1: 0001-Bumped-glob-and-cargo_metadata-to-latest-version.patch +Patch2: 0001-Bump-cargo_metadata-to-0.8.patch +Patch2: 0001-Bump-pulldown-cmark-to-0.5.patch ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -76,7 +81,7 @@ which use "default" feature of "%{crate}" crate. %changelog * Wed Jul 31 19:54:43 CEST 2019 Robert-André Mauchin - 0.13.4-3 -- Bump glob to 0.3 +- Bump glob to 0.3 and cargo_metadata to 0.8 * Fri Jul 26 2019 Fedora Release Engineering - 0.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/skeptic-fix-metadata.diff b/skeptic-fix-metadata.diff index ae22751..cef4055 100644 --- a/skeptic-fix-metadata.diff +++ b/skeptic-fix-metadata.diff @@ -1,6 +1,6 @@ --- skeptic-0.13.4/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ skeptic-0.13.4/Cargo.toml 2019-07-31T17:54:43.231811+00:00 -@@ -27,7 +27,7 @@ ++++ skeptic-0.13.4/Cargo.toml 2019-07-31T22:15:46.080294+00:00 +@@ -27,20 +27,20 @@ name = "skeptic" path = "lib.rs" [dependencies.bytecount] @@ -8,8 +8,11 @@ +version = "0.5" [dependencies.cargo_metadata] - version = "0.6" -@@ -37,7 +37,7 @@ +-version = "0.6" ++version = "0.8" + + [dependencies.error-chain] + version = "0.12" default-features = false [dependencies.glob] @@ -17,4 +20,8 @@ +version = "0.3" [dependencies.pulldown-cmark] - version = "0.2" +-version = "0.2" ++version = "0.5" + default-features = false + + [dependencies.serde_json]