about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Diebold <flodiebold@gmail.com>2016-11-24 19:42:07 +0100
committerFlorian Diebold <florian.diebold@freiheit.com>2016-11-29 13:04:27 +0100
commit725cffb1d58696e94d7a0d4fcb3b4143cfcdafd3 (patch)
tree6285b147013e1b5553608f48647df10909c9dd17
parentd5a501d312531f717f320b6a022562001489678b (diff)
downloadrust-725cffb1d58696e94d7a0d4fcb3b4143cfcdafd3.tar.gz
rust-725cffb1d58696e94d7a0d4fcb3b4143cfcdafd3.zip
Address remaining review comments
-rw-r--r--src/librustc/dep_graph/dep_node.rs3
-rw-r--r--src/test/incremental/source_loc_macros.rs5
2 files changed, 7 insertions, 1 deletions
diff --git a/src/librustc/dep_graph/dep_node.rs b/src/librustc/dep_graph/dep_node.rs
index d19bef6babe..0c941a4a230 100644
--- a/src/librustc/dep_graph/dep_node.rs
+++ b/src/librustc/dep_graph/dep_node.rs
@@ -42,7 +42,8 @@ pub enum DepNode<D: Clone + Debug> {
     // Represents the HIR node with the given node-id
     Hir(D),
 
-    // Represents the body of a function or method
+    // Represents the body of a function or method. The def-id is that of the
+    // function/method.
     HirBody(D),
 
     // Represents the metadata for a given HIR node, typically found
diff --git a/src/test/incremental/source_loc_macros.rs b/src/test/incremental/source_loc_macros.rs
index e81f690f5ca..36d1b3ecbcd 100644
--- a/src/test/incremental/source_loc_macros.rs
+++ b/src/test/incremental/source_loc_macros.rs
@@ -17,16 +17,19 @@
 
 #![feature(rustc_attrs)]
 
+#[rustc_clean(label="Hir", cfg="rpass2")]
 #[rustc_clean(label="HirBody", cfg="rpass2")]
 fn line_same() {
     let _ = line!();
 }
 
+#[rustc_clean(label="Hir", cfg="rpass2")]
 #[rustc_clean(label="HirBody", cfg="rpass2")]
 fn col_same() {
     let _ = column!();
 }
 
+#[rustc_clean(label="Hir", cfg="rpass2")]
 #[rustc_clean(label="HirBody", cfg="rpass2")]
 fn file_same() {
     let _ = file!();
@@ -38,6 +41,7 @@ fn line_different() {
 }
 
 #[cfg(rpass2)]
+#[rustc_clean(label="Hir", cfg="rpass2")]
 #[rustc_dirty(label="HirBody", cfg="rpass2")]
 fn line_different() {
     let _ = line!();
@@ -49,6 +53,7 @@ fn col_different() {
 }
 
 #[cfg(rpass2)]
+#[rustc_clean(label="Hir", cfg="rpass2")]
 #[rustc_dirty(label="HirBody", cfg="rpass2")]
 fn col_different() {
     let _ =        column!();