File tree Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Expand file tree Collapse file tree 1 file changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -773,10 +773,15 @@ fn lint_packages(workspace: &Path, args: LintPackagesArgs) -> Result<()> {
773
773
fn lint_package ( chip : & Chip , path : & Path , args : & [ & str ] , fix : bool ) -> Result < ( ) > {
774
774
log:: info!( "Linting package: {}" , path. display( ) ) ;
775
775
776
- let mut builder = CargoArgsBuilder :: default ( ) . subcommand ( "clippy" ) ;
776
+ let builder = CargoArgsBuilder :: default ( ) . subcommand ( "clippy" ) ;
777
777
778
- let toolchain = if chip. is_xtensa ( ) { "esp" } else { "nightly" } ;
779
- builder = builder. toolchain ( toolchain) ;
778
+ let mut builder = if chip. is_xtensa ( ) {
779
+ // We only overwrite Xtensas so that externally set nightly/stable toolchains
780
+ // are not overwritten.
781
+ builder. toolchain ( "esp" )
782
+ } else {
783
+ builder
784
+ } ;
780
785
781
786
for arg in args {
782
787
builder = builder. arg ( arg. to_string ( ) ) ;
You can’t perform that action at this time.
0 commit comments