itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify json production and append to archive

Browse Source 
Per github review.
This commit is contained in:
David Kellum 2018-08-16 12:33:32 -07:00
parent ab7877205f
commit d64c1687d9
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cargo/ops/cargo_package.rs
View File

@ -1,6 +1,6 @@
use std::fs::{self, File}; use std::fs::{self, File};
use std::io::{Cursor, SeekFrom, Write};
use std::io::prelude::*; use std::io::prelude::*;
use std::io::SeekFrom;
use std::path::{self, Path, PathBuf}; use std::path::{self, Path, PathBuf};
use std::sync::Arc; use std::sync::Arc;
@ -370,16 +370,14 @@ fn tar(
header.set_path(&path).chain_err(|| { header.set_path(&path).chain_err(|| {
format!("failed to add to archive: `{}`", fnd) format!("failed to add to archive: `{}`", fnd)
})?; })?;
let mut buff = Cursor::new(Vec::with_capacity(256)); let json = format!("{}\n", serde_json::to_string_pretty(json)?);
writeln!(buff, "{}", serde_json::to_string_pretty(json)?)?;
let mut header = Header::new_ustar(); let mut header = Header::new_ustar();
header.set_path(&path)?; header.set_path(&path)?;
header.set_entry_type(EntryType::file()); header.set_entry_type(EntryType::file());
header.set_mode(0o644); header.set_mode(0o644);
header.set_size(buff.position() as u64); header.set_size(json.len() as u64);
header.set_cksum(); header.set_cksum();
buff.seek(SeekFrom::Start(0))?; ar.append(&header, json.as_bytes()).chain_err(|| {
ar.append(&header, &mut buff).chain_err(|| {
internal(format!("could not archive source file `{}`", fnd)) internal(format!("could not archive source file `{}`", fnd))
})?; })?;
} }