This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11955

rust: fix build errors on darwin
ClosedPublic

Authored by danchr on Dec 30 2021, 8:08 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG440972d2175d: rust: fix build errors on darwin
rHGd6c53b40b078: rust: fix build errors on darwin
Summary

I'm not all _that_ versed in Rust, but I think the root cause is that
some constants are u16 rather than u32 on Darwin. I checked that the
code still compiles on the latest Ubuntu.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

danchr created this revision.Dec 30 2021, 8:08 AM
danchr added a comment.Jan 4 2022, 4:12 AM

This also occurs on FreeBSD 13.

danchr updated this revision to Diff 31583.Jan 4 2022, 11:39 AM
danchr updated this revision to Diff 31584.Jan 4 2022, 12:02 PM
Dan Villiom Podlaski Christiansen <danchr@gmail.com> added a commit: rHGd6c53b40b078: rust: fix build errors on darwin.Jan 4 2022, 2:58 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd6c53b40b078: rust: fix build errors on darwin (authored by Dan Villiom Podlaski Christiansen <danchr@gmail.com>). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31585

rust/hg-core/src/dirstate_tree/on_disk.rs

} else { } else {
libc::S_IFREG libc::S_IFREG
}; };
let permisions = if self.flags().contains(Flags::MODE_EXEC_PERM) { let permisions = if self.flags().contains(Flags::MODE_EXEC_PERM) {
0o755 0o755
} else { } else {
0o644 0o644
}; };
file_type | permisions (file_type | permisions).into()
} }
fn mtime(&self) -> Result<TruncatedTimestamp, DirstateV2ParseError> { fn mtime(&self) -> Result<TruncatedTimestamp, DirstateV2ParseError> {
let mut m: TruncatedTimestamp = self.mtime.try_into()?; let mut m: TruncatedTimestamp = self.mtime.try_into()?;
if self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) { if self.flags().contains(Flags::MTIME_SECOND_AMBIGUOUS) {
m.second_ambiguous = true; m.second_ambiguous = true;
} }
Ok(m) Ok(m)
fallback_symlink, fallback_symlink,
) = entry.v2_data(); ) = entry.v2_data();
// TODO: convert throug raw flag bits instead? // TODO: convert throug raw flag bits instead?
let mut flags = Flags::empty(); let mut flags = Flags::empty();
flags.set(Flags::WDIR_TRACKED, wdir_tracked); flags.set(Flags::WDIR_TRACKED, wdir_tracked);
flags.set(Flags::P1_TRACKED, p1_tracked); flags.set(Flags::P1_TRACKED, p1_tracked);
flags.set(Flags::P2_INFO, p2_info); flags.set(Flags::P2_INFO, p2_info);
let size = if let Some((m, s)) = mode_size_opt { let size = if let Some((m, s)) = mode_size_opt {
let exec_perm = m & libc::S_IXUSR != 0; let exec_perm = m & (libc::S_IXUSR as u32) != 0;
let is_symlink = m & libc::S_IFMT == libc::S_IFLNK; let is_symlink = m & (libc::S_IFMT as u32) == libc::S_IFLNK as u32;
flags.set(Flags::MODE_EXEC_PERM, exec_perm); flags.set(Flags::MODE_EXEC_PERM, exec_perm);
flags.set(Flags::MODE_IS_SYMLINK, is_symlink); flags.set(Flags::MODE_IS_SYMLINK, is_symlink);
flags.insert(Flags::HAS_MODE_AND_SIZE); flags.insert(Flags::HAS_MODE_AND_SIZE);
s.into() s.into()
} else { } else {
0.into() 0.into()
}; };
let mtime = if let Some(m) = mtime_opt { let mtime = if let Some(m) = mtime_opt {