This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7678

rust-warnings: fix warnings in tests
ClosedPublic

Authored by Alphare on Dec 16 2019, 5:28 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd8a96cebf75d: rust-warnings: fix warnings in tests
Summary

It turns out that I also missed those warnings inside tests. This should be the
last of them. One day we will get rid of this interface anyway.

Diff Detail

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

Event Timeline

Alphare created this revision.Dec 16 2019, 5:28 AM
Alphare added a commit: rHGd8a96cebf75d: rust-warnings: fix warnings in tests.Dec 16 2019, 6:37 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd8a96cebf75d: rust-warnings: fix warnings in tests (authored by Alphare). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 18754

rust/hg-core/src/dirstate/dirs_multiset.rs

); );
} }
#[test] #[test]
fn test_add_path_empty_path() { fn test_add_path_empty_path() {
let manifest: Vec<HgPathBuf> = vec![]; let manifest: Vec<HgPathBuf> = vec![];
let mut map = DirsMultiset::from_manifest(&manifest).unwrap(); let mut map = DirsMultiset::from_manifest(&manifest).unwrap();
let path = HgPath::new(b""); let path = HgPath::new(b"");
map.add_path(path); map.add_path(path).unwrap();
assert_eq!(1, map.len()); assert_eq!(1, map.len());
} }
#[test] #[test]
fn test_add_path_successful() { fn test_add_path_successful() {
let manifest: Vec<HgPathBuf> = vec![]; let manifest: Vec<HgPathBuf> = vec![];
let mut map = DirsMultiset::from_manifest(&manifest).unwrap(); let mut map = DirsMultiset::from_manifest(&manifest).unwrap();
map.add_path(HgPath::new(b"a/")); map.add_path(HgPath::new(b"a/")).unwrap();
assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(1, *map.inner.get(HgPath::new(b"")).unwrap()); assert_eq!(1, *map.inner.get(HgPath::new(b"")).unwrap());
assert_eq!(2, map.len()); assert_eq!(2, map.len());
// Non directory should be ignored // Non directory should be ignored
map.add_path(HgPath::new(b"a")); map.add_path(HgPath::new(b"a")).unwrap();
assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(1, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(2, map.len()); assert_eq!(2, map.len());
// Non directory will still add its base // Non directory will still add its base
map.add_path(HgPath::new(b"a/b")); map.add_path(HgPath::new(b"a/b")).unwrap();
assert_eq!(2, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(2, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(2, map.len()); assert_eq!(2, map.len());
// Duplicate path works // Duplicate path works
map.add_path(HgPath::new(b"a/")); map.add_path(HgPath::new(b"a/")).unwrap();
assert_eq!(3, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(3, *map.inner.get(HgPath::new(b"a")).unwrap());
// Nested dir adds to its base // Nested dir adds to its base
map.add_path(HgPath::new(b"a/b/")); map.add_path(HgPath::new(b"a/b/")).unwrap();
assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(1, *map.inner.get(HgPath::new(b"a/b")).unwrap()); assert_eq!(1, *map.inner.get(HgPath::new(b"a/b")).unwrap());
// but not its base's base, because it already existed // but not its base's base, because it already existed
map.add_path(HgPath::new(b"a/b/c/")); map.add_path(HgPath::new(b"a/b/c/")).unwrap();
assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap()); assert_eq!(4, *map.inner.get(HgPath::new(b"a")).unwrap());
assert_eq!(2, *map.inner.get(HgPath::new(b"a/b")).unwrap()); assert_eq!(2, *map.inner.get(HgPath::new(b"a/b")).unwrap());
map.add_path(HgPath::new(b"a/c/")); map.add_path(HgPath::new(b"a/c/")).unwrap();
assert_eq!(1, *map.inner.get(HgPath::new(b"a/c")).unwrap()); assert_eq!(1, *map.inner.get(HgPath::new(b"a/c")).unwrap());
let expected = DirsMultiset { let expected = DirsMultiset {
inner: [("", 2), ("a", 5), ("a/b", 2), ("a/b/c", 1), ("a/c", 1)] inner: [("", 2), ("a", 5), ("a/b", 2), ("a/b/c", 1), ("a/c", 1)]
.iter() .iter()
.map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v)) .map(|(k, v)| (HgPathBuf::from_bytes(k.as_bytes()), *v))
.collect(), .collect(),
}; };

rust/hg-core/src/dirstate/dirstate_map.rs

HgPath::new(b"meh"), HgPath::new(b"meh"),
EntryState::Normal, EntryState::Normal,
DirstateEntry { DirstateEntry {
state: EntryState::Normal, state: EntryState::Normal,
mode: 1337, mode: 1337,
mtime: 1337, mtime: 1337,
size: 1337, size: 1337,
}, },
); )
.unwrap();
assert_eq!(1, map.len()); assert_eq!(1, map.len());
assert_eq!(0, map.non_normal_set.len()); assert_eq!(0, map.non_normal_set.len());
assert_eq!(0, map.other_parent_set.len()); assert_eq!(0, map.other_parent_set.len());
} }
#[test] #[test]
fn test_non_normal_other_parent_entries() { fn test_non_normal_other_parent_entries() {