( )⚙ D11670 rhg: fix formatting error reported by test-check-format-rust.t

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11670

rhg: fix formatting error reported by test-check-format-rust.t
ClosedPublic

Authored by martinvonz on Oct 15 2021, 1:36 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1837663ac216: rhg: fix formatting error reported by test-check-format-rust.t

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.Oct 15 2021, 1:36 AM
martinvonz added a subscriber: aalekseyev.Oct 15 2021, 1:38 AM

@aalekseyev, I think you'll want to run rustup install nightly-2020-10-04 to make sure that test-check-format-test.t runs.

aalekseyev added a comment.Oct 15 2021, 5:02 AM

@martinvonz, indeed, thanks. Sorry.

pulkit accepted this revision.Oct 15 2021, 8:42 AM
This revision is now accepted and ready to land.Oct 15 2021, 8:42 AM
martinvonz added a comment.Oct 15 2021, 10:35 AM
In D11670#178934, @aalekseyev wrote:

@martinvonz, indeed, thanks. Sorry.

No problem. The reason I didn't notice it earlier was that I also didn't have that version of rustfmt installed :)

marmoute added a subscriber: marmoute.Oct 17 2021, 8:36 AM

I also recommend pushing your changes to https://foss.heptapod.net/mercurial/mercurial-devel/ before submission. This will get them a full CI runs first.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/operations/cat.rs (6 lines)

Diff 30823

rust/hg-core/src/operations/cat.rs

for (manifest_file, node_bytes) in found { for (manifest_file, node_bytes) in found {
found_any = true; found_any = true;
let file_log = repo.filelog(manifest_file)?; let file_log = repo.filelog(manifest_file)?;
let file_node = Node::from_hex_for_repo(node_bytes)?; let file_node = Node::from_hex_for_repo(node_bytes)?;
bytes.extend(file_log.data_for_node(file_node)?.data()?); bytes.extend(file_log.data_for_node(file_node)?.data()?);
} }
let missing: Vec<HgPathBuf> = missing let missing: Vec<HgPathBuf> =
.iter() missing.iter().map(|file| (*file).to_owned()).collect();
.map(|file| (*file).to_owned())
.collect();
Ok(CatOutput { Ok(CatOutput {
found_any, found_any,
concatenated: bytes, concatenated: bytes,
missing, missing,
node, node,
}) })
} }