@@ -23,10 +23,9 @@ fn dogfood_clippy() {
23
23
. current_dir ( root_dir)
24
24
. env ( "CLIPPY_DOGFOOD" , "1" )
25
25
. env ( "CARGO_INCREMENTAL" , "0" )
26
- . arg ( "clippy-preview " )
26
+ . arg ( "clippy" )
27
27
. arg ( "--all-targets" )
28
28
. arg ( "--all-features" )
29
- . args ( & [ "-p" , "clippy_lints" , "-p" , "clippy_utils" , "-p" , "rustc_tools_util" ] )
30
29
. arg ( "--" )
31
30
. args ( & [ "-D" , "clippy::all" ] )
32
31
. args ( & [ "-D" , "clippy::pedantic" ] )
@@ -125,19 +124,30 @@ fn dogfood_subprojects() {
125
124
"clippy_workspace_tests/subcrate" ,
126
125
"clippy_workspace_tests/subcrate/src" ,
127
126
"clippy_dev" ,
127
+ "clippy_lints" ,
128
+ "clippy_utils" ,
128
129
"rustc_tools_util" ,
129
130
] {
130
- let output = Command :: new ( & * CLIPPY_PATH )
131
+ let mut command = Command :: new ( & * CLIPPY_PATH ) ;
132
+ command
131
133
. current_dir ( root_dir. join ( d) )
132
134
. env ( "CLIPPY_DOGFOOD" , "1" )
133
135
. env ( "CARGO_INCREMENTAL" , "0" )
134
136
. arg ( "clippy" )
137
+ . arg ( "--all-targets" )
138
+ . arg ( "--all-features" )
135
139
. arg ( "--" )
136
140
. args ( & [ "-D" , "clippy::all" ] )
137
141
. args ( & [ "-D" , "clippy::pedantic" ] )
138
- . arg ( "-Cdebuginfo=0" ) // disable debuginfo to generate less data in the target dir
139
- . output ( )
140
- . unwrap ( ) ;
142
+ . arg ( "-Cdebuginfo=0" ) ; // disable debuginfo to generate less data in the target dir
143
+
144
+ // internal lints only exist if we build with the internal-lints feature
145
+ if cfg ! ( feature = "internal-lints" ) {
146
+ command. args ( & [ "-D" , "clippy::internal" ] ) ;
147
+ }
148
+
149
+ let output = command. output ( ) . unwrap ( ) ;
150
+
141
151
println ! ( "status: {}" , output. status) ;
142
152
println ! ( "stdout: {}" , String :: from_utf8_lossy( & output. stdout) ) ;
143
153
println ! ( "stderr: {}" , String :: from_utf8_lossy( & output. stderr) ) ;
0 commit comments