Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.89.0"
channel = "1.97.1"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Two notes on this line, neither blocking.

1.97.1 is now one release behind stable. 1.98.0 shipped 2026-08-18, so the PR description's "1.97.1, an eight-release jump" is right but "current stable" language elsewhere in this series has already aged. Pinning one behind stable is a perfectly defensible choice — just flagging that the pin is no longer the newest if the intent was to land on current.

Commit-order convention differs from the sibling PR. rubyatscale/pks#57's toolchain bump (#52) deliberately lands the lint fixes first so every commit passes clippy independently and git bisect never lands on a red commit. This PR lands the bump first and notes d03f8d8 fails clippy on its own. Same author, same day, same lint, opposite call. Both are reasonable in isolation; worth picking one convention across the two repos so the next bump doesn't have to re-decide. (You already offered to squash — that would resolve it here.)

components = ["clippy", "rustfmt"]
targets = ["x86_64-apple-darwin", "aarch64-apple-darwin", "x86_64-unknown-linux-gnu"]
2 changes: 1 addition & 1 deletion src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ impl Args {
fn absolute_project_root(&self) -> Result<PathBuf, Report<RunnerError>> {
self.project_root.canonicalize().change_context(RunnerError::Io(format!(
"Can't canonicalize project root: {}",
&self.project_root.to_string_lossy()
self.project_root.to_string_lossy()
)))
}

Expand Down
2 changes: 1 addition & 1 deletion src/ownership/validator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl Display for Errors {
let messages = errors.iter().flat_map(|error| error.messages()).sorted().join("\n");
if !messages.is_empty() {
writeln!(f)?;
write!(f, "{}", &messages)?;
write!(f, "{}", messages)?;
}

writeln!(f)?;
Expand Down
10 changes: 5 additions & 5 deletions src/runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,22 +89,22 @@ impl Runner {
GlobalCache::new(run_config.project_root.clone(), config.cache_directory.clone())
.change_context(Error::Io(format!(
"Can't create cache: {}",
&run_config.config_path.to_string_lossy()
run_config.config_path.to_string_lossy()
)))
.attach(format!("Can't create cache: {}", &run_config.config_path.to_string_lossy()))?
.attach(format!("Can't create cache: {}", run_config.config_path.to_string_lossy()))?
.into()
};

let mut project_builder = ProjectBuilder::new(&config, run_config.project_root.clone(), codeowners_file_path.clone(), &cache);
let project = project_builder.build().change_context(Error::Io(format!(
"Can't build project: {}",
&run_config.config_path.to_string_lossy()
run_config.config_path.to_string_lossy()
)))?;
let ownership = Ownership::build(project);

cache.persist_cache().change_context(Error::Io(format!(
"Can't persist cache: {}",
&run_config.config_path.to_string_lossy()
run_config.config_path.to_string_lossy()
)))?;

Ok(Self {
Expand Down Expand Up @@ -250,7 +250,7 @@ impl Runner {
pub fn delete_cache(&self) -> RunResult {
match self.cache.delete_cache().change_context(Error::Io(format!(
"Can't delete cache: {}",
&self.run_config.config_path.to_string_lossy()
self.run_config.config_path.to_string_lossy()
))) {
Ok(_) => RunResult::default(),
Err(err) => RunResult {
Expand Down
2 changes: 1 addition & 1 deletion tests/common/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn teardown() {
.filter_map(Result::ok)
.for_each(|cache_dir| {
if let Err(err) = fs::remove_dir_all(&cache_dir) {
eprintln!("Failed to remove {} during test teardown: {}", &cache_dir.display(), err);
eprintln!("Failed to remove {} during test teardown: {}", cache_dir.display(), err);
}
});
}
Expand Down
Loading