@@ -33,9 +33,10 @@ use std::fmt;
33
33
use tracing as log;
34
34
35
35
#[ cfg( test) ]
36
- mod tests_candidates;
37
- #[ cfg( test) ]
38
- mod tests_from_diff;
36
+ mod tests {
37
+ mod tests_candidates;
38
+ mod tests_from_diff;
39
+ }
39
40
40
41
const NEW_USER_WELCOME_MESSAGE : & str = "Thanks for the pull request, and welcome! \
41
42
The Rust team is excited to review your changes, and you should hear from {who} soon.";
@@ -68,7 +69,7 @@ struct AssignData {
68
69
69
70
/// Input for auto-assignment when a PR is created.
70
71
pub ( super ) struct AssignInput {
71
- diff : String ,
72
+ git_diff : String ,
72
73
}
73
74
74
75
/// Prepares the input when a new PR is opened.
@@ -87,15 +88,15 @@ pub(super) async fn parse_input(
87
88
{
88
89
return Ok ( None ) ;
89
90
}
90
- let diff = match event. issue . diff ( & ctx. github ) . await {
91
+ let git_diff = match event. issue . diff ( & ctx. github ) . await {
91
92
Ok ( None ) => return Ok ( None ) ,
92
93
Err ( e) => {
93
94
log:: error!( "failed to fetch diff: {:?}" , e) ;
94
95
return Ok ( None ) ;
95
96
}
96
97
Ok ( Some ( diff) ) => diff,
97
98
} ;
98
- Ok ( Some ( AssignInput { diff } ) )
99
+ Ok ( Some ( AssignInput { git_diff } ) )
99
100
}
100
101
101
102
/// Handles the work of setting an assignment for a new PR and posting a
@@ -161,7 +162,7 @@ pub(super) async fn handle_input(
161
162
if config. warn_non_default_branch {
162
163
warnings. extend ( non_default_branch ( event) ) ;
163
164
}
164
- warnings. extend ( modifies_submodule ( & input. diff ) ) ;
165
+ warnings. extend ( modifies_submodule ( & input. git_diff ) ) ;
165
166
if !warnings. is_empty ( ) {
166
167
let warnings: Vec < _ > = warnings
167
168
. iter ( )
@@ -272,7 +273,7 @@ async fn determine_assignee(
272
273
}
273
274
}
274
275
// Errors fall-through to try fallback group.
275
- match find_reviewers_from_diff ( config, & input. diff ) {
276
+ match find_reviewers_from_diff ( config, & input. git_diff ) {
276
277
Ok ( candidates) if !candidates. is_empty ( ) => {
277
278
match find_reviewer_from_names ( & teams, config, & event. issue , & candidates) {
278
279
Ok ( assignee) => return Ok ( ( Some ( assignee) , false ) ) ,
@@ -378,7 +379,7 @@ fn find_reviewers_from_diff(config: &AssignConfig, diff: &str) -> anyhow::Result
378
379
let max_paths = counts
379
380
. iter ( )
380
381
. filter ( |( _, count) | * * count == max_count)
381
- . map ( |x| x . 0 ) ;
382
+ . map ( |( path , _ ) | path ) ;
382
383
let mut potential: Vec < _ > = max_paths
383
384
. flat_map ( |owner_path| & config. owners [ * owner_path] )
384
385
. map ( |owner| owner. to_string ( ) )
0 commit comments