Rename stamp to stamp_file_path

Author: Zalathar

src/tools/compiletest/src/lib.rs

@@ -837,7 +837,7 @@ fn make_test(cx: &TestCollectorCx, collector: &mut TestCollector, testpaths: &Te
 
 /// The path of the `stamp` file that gets created or updated whenever a
 /// particular test completes successfully.
-fnstamp(config:&Config,testpaths:&TestPaths,revision:Option<&str>) -> PathBuf{
+fnstamp_file_path(config:&Config,testpaths:&TestPaths,revision:Option<&str>) -> PathBuf{
 output_base_dir(config, testpaths, revision).join("stamp")
 }
 
@@ -891,9 +891,9 @@ fn is_up_to_date(
 props:&EarlyProps,
 revision:Option<&str>,
 ) -> bool{
-letstamp_name = stamp(&cx.config, testpaths, revision);
+letstamp_file_path = stamp_file_path(&cx.config, testpaths, revision);
 // Check the config hash inside the stamp file.
-let contents = match fs::read_to_string(&stamp_name){
+let contents = match fs::read_to_string(&stamp_file_path){
 Ok(f) => f,
 Err(ref e)if e.kind() == ErrorKind::InvalidData => panic!("Can't read stamp contents"),
 // The test hasn't succeeded yet, so it is not up-to-date.
@@ -915,7 +915,7 @@ fn is_up_to_date(
 
 // If no relevant files have been modified since the stamp file was last
 // written, the test is up-to-date.
- inputs_stamp < Stamp::from_path(&stamp_name)
+ inputs_stamp < Stamp::from_path(&stamp_file_path)
 }
 
 /// The maximum of a set of file-modified timestamps.

src/tools/compiletest/src/runtest.rs

@@ -29,7 +29,7 @@ use crate::errors::{self, Error, ErrorKind};
 usecrate::header::TestProps;
 usecrate::read2::{Truncated, read2_abbreviated};
 usecrate::util::{PathBufExt, add_dylib_path, logv, static_regex};
-usecrate::{ColorConfig, json};
+usecrate::{ColorConfig, json, stamp_file_path};
 
 mod debugger;
 
@@ -2595,8 +2595,8 @@ impl<'test> TestCx<'test> {
 }
 
 fncreate_stamp(&self){
-letstamp = crate::stamp(&self.config,self.testpaths,self.revision);
- fs::write(&stamp,compute_stamp_hash(&self.config)).unwrap();
+letstamp_file_path = stamp_file_path(&self.config,self.testpaths,self.revision);
+ fs::write(&stamp_file_path,compute_stamp_hash(&self.config)).unwrap();
 }
 
 fninit_incremental_test(&self){