From 89aec1eb0bbae38123ffb3e41dc9c2af62527e14 Mon Sep 17 00:00:00 2001 From: Michael Woerister Date: Fri, 22 Sep 2017 16:59:31 +0200 Subject: [PATCH] incr.comp.: Remove out-dated unit test and unnecessary assertion. --- src/librustc/dep_graph/graph.rs | 3 -- src/librustc_incremental/persist/fs.rs | 49 -------------------------- 2 files changed, 52 deletions(-) diff --git a/src/librustc/dep_graph/graph.rs b/src/librustc/dep_graph/graph.rs index 2ac3884dce1..71a7ee84cd1 100644 --- a/src/librustc/dep_graph/graph.rs +++ b/src/librustc/dep_graph/graph.rs @@ -244,9 +244,6 @@ pub fn read(&self, v: DepNode) { data.edges.borrow_mut().read(v); let mut current = data.current.borrow_mut(); - debug_assert!(current.node_to_node_index.contains_key(&v), - "DepKind {:?} should be pre-allocated but isn't.", - v.kind); if let Some(&dep_node_index_new) = current.node_to_node_index.get(&v) { current.read_index(dep_node_index_new); } else { diff --git a/src/librustc_incremental/persist/fs.rs b/src/librustc_incremental/persist/fs.rs index 8d729e5e052..592b8f1a9eb 100644 --- a/src/librustc_incremental/persist/fs.rs +++ b/src/librustc_incremental/persist/fs.rs @@ -953,52 +953,3 @@ fn test_find_source_directory_in_iter() { PathBuf::from("crate-dir/s-1234-0000-working")].into_iter(), &already_visited), None); } - -#[test] -fn test_find_metadata_hashes_iter() -{ - assert_eq!(find_metadata_hashes_iter("testsvh2", - vec![ - String::from("s-timestamp1-testsvh1"), - String::from("s-timestamp2-testsvh2"), - String::from("s-timestamp3-testsvh3"), - ].into_iter()), - Some(OsString::from("s-timestamp2-testsvh2")) - ); - - assert_eq!(find_metadata_hashes_iter("testsvh2", - vec![ - String::from("s-timestamp1-testsvh1"), - String::from("s-timestamp2-testsvh2"), - String::from("invalid-name"), - ].into_iter()), - Some(OsString::from("s-timestamp2-testsvh2")) - ); - - assert_eq!(find_metadata_hashes_iter("testsvh2", - vec![ - String::from("s-timestamp1-testsvh1"), - String::from("s-timestamp2-testsvh2-working"), - String::from("s-timestamp3-testsvh3"), - ].into_iter()), - None - ); - - assert_eq!(find_metadata_hashes_iter("testsvh1", - vec![ - String::from("s-timestamp1-random1-working"), - String::from("s-timestamp2-random2-working"), - String::from("s-timestamp3-random3-working"), - ].into_iter()), - None - ); - - assert_eq!(find_metadata_hashes_iter("testsvh2", - vec![ - String::from("timestamp1-testsvh2"), - String::from("timestamp2-testsvh2"), - String::from("timestamp3-testsvh2"), - ].into_iter()), - None - ); -} -- GitLab