Bump to object 0.11

epel9
Josh Stone 6 years ago
parent 1f76550eea
commit d8d60f2882

@ -0,0 +1,38 @@
From 017a2d92e40dd938a37c6bf08e01f9e98790fdac Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@redhat.com>
Date: Tue, 27 Nov 2018 12:01:51 -0800
Subject: [PATCH] Update Object lifetimes for 0.11
---
src/lib.rs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/lib.rs b/src/lib.rs
index eb9ead251cd3..24e2445f5921 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -121,16 +121,18 @@ impl Context<gimli::EndianRcSlice<gimli::RunTimeEndian>> {
///
/// Performance sensitive applications may want to use `Context::from_sections`
/// with a more specialised `gimli::Reader` implementation.
- pub fn new<'input, 'data, O: object::Object<'input, 'data>>(file: &O) -> Result<Self, Error> {
+ pub fn new<'data, 'file, O: object::Object<'data, 'file>>(
+ file: &'file O,
+ ) -> Result<Self, Error> {
let endian = if file.is_little_endian() {
gimli::RunTimeEndian::Little
} else {
gimli::RunTimeEndian::Big
};
- fn load_section<'input, 'data, O, S, Endian>(file: &O, endian: Endian) -> S
+ fn load_section<'data, 'file, O, S, Endian>(file: &'file O, endian: Endian) -> S
where
- O: object::Object<'input, 'data>,
+ O: object::Object<'data, 'file>,
S: gimli::Section<gimli::EndianRcSlice<Endian>>,
Endian: gimli::Endianity,
{
--
2.19.1

@ -1,11 +1,11 @@
--- addr2line-0.7.0/Cargo.toml 1969-12-31T16:00:00-08:00
+++ addr2line-0.7.0/Cargo.toml 2018-10-02T10:19:19.773585-07:00
+++ addr2line-0.7.0/Cargo.toml 2018-11-27T10:42:42.057776-08:00
@@ -51,7 +51,7 @@
version = "1.0"
[dependencies.object]
-version = "0.9"
+version = "0.10"
+version = "0.11"
[dependencies.rustc-demangle]
version = "0.1"

@ -8,7 +8,7 @@
Name: rust-%{crate}
Version: 0.7.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Cross-platform symbolication library written in Rust, using `gimli`
# Upstream license specification: Apache-2.0/MIT
@ -16,8 +16,10 @@ License: ASL 2.0 or MIT
URL: https://crates.io/crates/addr2line
Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
# Initial patched metadata
# * bump object to 0.10
# * bump object to 0.11
Patch0: addr2line-fix-metadata.diff
# https://github.com/gimli-rs/addr2line/pull/107
Patch1: 0001-Update-Object-lifetimes-for-0.11.patch
ExclusiveArch: %{rust_arches}
@ -27,7 +29,7 @@ BuildRequires: (crate(fallible-iterator/default) >= 0.1.0 with crate(fallible-i
BuildRequires: (crate(gimli/default) >= 0.16.0 with crate(gimli/default) < 0.17.0)
BuildRequires: (crate(intervaltree/default) >= 0.2.0 with crate(intervaltree/default) < 0.3.0)
BuildRequires: (crate(lazycell/default) >= 1.0.0 with crate(lazycell/default) < 2.0.0)
BuildRequires: (crate(object/default) >= 0.10.0 with crate(object/default) < 0.11.0)
BuildRequires: (crate(object/default) >= 0.11.0 with crate(object/default) < 0.12.0)
BuildRequires: (crate(rustc-demangle/default) >= 0.1.0 with crate(rustc-demangle/default) < 0.2.0)
BuildRequires: (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0)
%if %{with check}
@ -110,6 +112,9 @@ which use "rustc-demangle" feature of "%{crate}" crate.
%endif
%changelog
* Tue Nov 27 2018 Josh Stone <jistone@redhat.com> - 0.7.0-4
- Bump to object 0.11
* Tue Nov 13 2018 Josh Stone <jistone@redhat.com> - 0.7.0-3
- Adapt to new packaging

Loading…
Cancel
Save