rust-lang · bors · Jul 8, 2024 · Jul 7, 2024 · Kobzol · Jul 7, 2024
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -296,7 +296,8 @@ pub fn not_contains<P: AsRef<Path>>(path: P, expected: &str) -> bool {
 }

 /// Returns true if the filename at `path` is not in `expected`.
-pub fn filename_not_in_denylist<P: AsRef<Path>>(path: P, expected: &[String]) -> bool {
+pub fn filename_not_in_denylist<P: AsRef<Path>, V: AsRef<[String]>>(path: P, expected: V) -> bool {
+    let expected = expected.as_ref();
    path.as_ref()
        .file_name()
        .is_some_and(|name| !expected.contains(&name.to_str().unwrap().to_owned()))

diff --git a/tests/run-make/output-type-permutations/rmake.rs b/tests/run-make/output-type-permutations/rmake.rs
@@ -17,9 +17,8 @@ use std::path::PathBuf;
 // `rustc_invocation`: the rustc command being tested
 // Any unexpected output files not listed in `must_exist` or `can_exist` will cause a failure.
 fn assert_expected_output_files(expectations: Expectations, rustc_invocation: impl Fn()) {
-    let must_exist = expectations.expected_files;
-    let can_exist = expectations.allowed_files;
-    let dir = expectations.test_dir;
+    let Expectations { expected_files: must_exist, allowed_files: can_exist, test_dir: dir } =
+        expectations;

    fs_wrapper::create_dir(&dir);
    rustc_invocation();
-Original file line number
+Diff line change
@@ -296,7 +296,8 @@ pub fn not_contains<P: AsRef<Path>>(path: P, expected: &str) -> bool {
     }
     /// Returns true if the filename at `path` is not in `expected`.
-    pub fn filename_not_in_denylist<P: AsRef<Path>>(path: P, expected: &[String]) -> bool {
+    pub fn filename_not_in_denylist<P: AsRef<Path>, V: AsRef<[String]>>(path: P, expected: V) -> bool {
             Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            Kobzol
  

      

      

      


        Jul 7, 2024


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I'm not sure if we need to stuff these generics everywhere, as it makes the compilation of each run-make test slightly slower. But if the function was already generic before, it doesn't really change anything, so should be fine here.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+        let expected = expected.as_ref();
         path.as_ref()
             .file_name()
             .is_some_and(|name| !expected.contains(&name.to_str().unwrap().to_owned()))
-          Expand Down