mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-30 16:19:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

clippy: run cargo clippy --fix --workspace with recent nightly

Browse source
This commit is contained in:
Ilya Grigoriev 2023-10-27 21:20:44 -07:00
parent 1d918dff08
commit 2571169251
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/commands/resolve.rs
View file

@ -93,7 +93,7 @@ pub(crate) fn cmd_resolve(
);
};
let (repo_path, _) = conflicts.get(0).unwrap();
let (repo_path, _) = conflicts.first().unwrap();
workspace_command.check_rewritable([&commit])?;
let mut tx = workspace_command.start_transaction(&format!(
"Resolve conflicts in commit {}",

2
cli/tests/test_commit_command.rs
View file

@ -85,7 +85,7 @@ fn test_commit_with_default_description() {
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
let edit_script = test_env.set_up_fake_editor();
std::fs::write(&edit_script, ["dump editor"].join("\0")).unwrap();
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
test_env.jj_cmd_ok(&workspace_path, &["commit"]);
insta::assert_snapshot!(get_log_output(&test_env, &workspace_path), @r#"

2
cli/tests/test_describe_command.rs
View file

@ -259,7 +259,7 @@ fn test_describe_default_description() {
std::fs::write(workspace_path.join("file1"), "foo\n").unwrap();
std::fs::write(workspace_path.join("file2"), "bar\n").unwrap();
let edit_script = test_env.set_up_fake_editor();
std::fs::write(&edit_script, ["dump editor"].join("\0")).unwrap();
std::fs::write(edit_script, ["dump editor"].join("\0")).unwrap();
let (stdout, stderr) = test_env.jj_cmd_ok(&workspace_path, &["describe"]);
insta::assert_snapshot!(stdout, @"");
insta::assert_snapshot!(stderr, @r###"