Skip to content

Commit f06e3c6

Browse files
committed
Update dependencies and bump the patch version
1 parent f2d3c36 commit f06e3c6

File tree

5 files changed

+77
-72
lines changed

5 files changed

+77
-72
lines changed

Cargo.lock

+66-61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "armerge"
3-
version = "1.3.1"
3+
version = "1.3.2"
44
authors = ["tux3 <[email protected]>"]
55
edition = "2018"
66
license = "MIT OR Apache-2.0"
@@ -12,11 +12,11 @@ description = "Tool to merge and control visibility of static libraries"
1212
[dependencies]
1313
objpoke = "0.2"
1414
structopt = "0.3"
15-
ar = "0.8"
15+
ar = "0.9"
1616
tempdir = "0.3.7"
17-
rand = "0.7.3"
18-
object = "0.23"
19-
goblin = "0.3"
17+
rand = "0.8"
18+
object = "0.27"
19+
goblin = "0.4"
2020
regex = "1.3.9"
2121
rayon = "1.4.0"
2222
which = "4.0.2"

src/archives.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use crate::arbuilder::ArBuilder;
22
use crate::objects::ObjectTempDir;
33
use ar::Archive;
4-
use rand::distributions::Alphanumeric;
5-
use rand::{thread_rng, Rng};
4+
use rand::distributions::{Alphanumeric, DistString};
5+
use rand::thread_rng;
66
use std::error::Error;
77
use std::fs::File;
88
use std::io::Write;
@@ -24,12 +24,12 @@ pub fn extract_objects(archives: &[PathBuf]) -> Result<ObjectTempDir, Box<dyn Er
2424
while let Some(entry_result) = archive.next_entry() {
2525
let mut entry = entry_result?;
2626

27-
let rnd: String = thread_rng().sample_iter(&Alphanumeric).take(8).collect();
27+
let rnd: String = Alphanumeric.sample_string(&mut thread_rng(), 8);
2828
let mut obj_path = dir.path().to_owned();
2929
obj_path.push(format!(
3030
"{}@{}.{}.o",
3131
archive_name,
32-
from_utf8(entry.header().identifier())?.to_string(),
32+
from_utf8(entry.header().identifier())?,
3333
&rnd
3434
));
3535

src/objects/syms.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ impl ObjectSyms {
2121
let mut has_exported_symbols = false;
2222

2323
let data = std::fs::read(object_path)?;
24-
let file = object::File::parse(&data)?;
24+
let file = object::File::parse(data.as_slice())?;
2525
for sym in file.symbols() {
2626
if sym.kind() != SymbolKind::Text
2727
&& sym.kind() != SymbolKind::Data

src/objects/system_filter.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn create_symbol_filter_list(
5757

5858
for object_path in objects.into_iter() {
5959
let data = std::fs::read(object_path)?;
60-
let file = object::File::parse(&data)?;
60+
let file = object::File::parse(data.as_slice())?;
6161
'next_symbol: for sym in file.symbols() {
6262
if !sym.is_global()
6363
|| sym.is_undefined()

0 commit comments

Comments
 (0)