Skip to content

Commit b8f3cd4

Browse files
committed
Auto-lint xtensas with esp toolchain
1 parent 3957a1c commit b8f3cd4

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

xtask/src/main.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -773,10 +773,15 @@ fn lint_packages(workspace: &Path, args: LintPackagesArgs) -> Result<()> {
773773
fn lint_package(chip: &Chip, path: &Path, args: &[&str], fix: bool) -> Result<()> {
774774
log::info!("Linting package: {}", path.display());
775775

776-
let mut builder = CargoArgsBuilder::default().subcommand("clippy");
776+
let builder = CargoArgsBuilder::default().subcommand("clippy");
777777

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+
};
780785

781786
for arg in args {
782787
builder = builder.arg(arg.to_string());

0 commit comments

Comments
 (0)