Skip to content

Commit 083909b

Browse files
committed
Merge branch 'adjustments-for-cargo'
2 parents fbfd290 + 680c143 commit 083909b

File tree

105 files changed

+1017
-398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1017
-398
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ jobs:
120120
- uses: actions/checkout@v3
121121
- uses: dtolnay/rust-toolchain@master
122122
with:
123-
toolchain: stable
123+
toolchain: 1.65 # clippy is broken for us in 1.66
124124
components: clippy,rustfmt
125125
- name: Run cargo clippy
126126
run: cargo clippy --all --tests

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ check: ## Build all code in suitable configurations
9595
&& cargo check
9696
cd git-features && cargo check --all-features \
9797
&& cargo check --features parallel \
98-
&& cargo check --features parallel,fs-walkdir-parallel \
98+
&& cargo check --features fs-walkdir-parallel \
9999
&& cargo check --features rustsha1 \
100100
&& cargo check --features fast-sha1 \
101101
&& cargo check --features progress \

git-attributes/tests/match_group/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ mod ignore {
3232

3333
#[test]
3434
fn from_git_dir() -> crate::Result {
35-
let dir = git_testtools::scripted_fixture_repo_read_only("make_global_and_external_and_dir_ignores.sh")?;
35+
let dir = git_testtools::scripted_fixture_read_only("make_global_and_external_and_dir_ignores.sh")?;
3636
let repo_dir = dir.join("repo");
3737
let git_dir = repo_dir.join(".git");
3838
let baseline = std::fs::read(git_dir.parent().unwrap().join("git-check-ignore.baseline"))?;

git-commitgraph/tests/commitgraph.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ pub fn check_common(cg: &Graph, expected: &HashMap<String, RefInfo, impl BuildHa
6060
);
6161
}
6262

63-
use git_testtools::scripted_fixture_repo_read_only;
63+
use git_testtools::scripted_fixture_read_only;
6464
pub fn make_readonly_repo(script_path: &str) -> std::path::PathBuf {
65-
scripted_fixture_repo_read_only(script_path).expect("script succeeds all the time")
65+
scripted_fixture_read_only(script_path).expect("script succeeds all the time")
6666
}
6767

6868
pub fn hex_to_id(hex: &[u8]) -> git_hash::ObjectId {

git-config/tests/file/init/comfort.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fn from_environment_overrides() {
2121
#[test]
2222
#[serial]
2323
fn from_git_dir() -> crate::Result {
24-
let worktree_dir = git_testtools::scripted_fixture_repo_read_only("make_config_repo.sh")?;
24+
let worktree_dir = git_testtools::scripted_fixture_read_only("make_config_repo.sh")?;
2525
let git_dir = worktree_dir.join(".git");
2626
let worktree_dir = worktree_dir.canonicalize()?;
2727
let _env = Env::new()
@@ -84,7 +84,7 @@ fn from_git_dir() -> crate::Result {
8484
#[test]
8585
#[serial]
8686
fn from_git_dir_with_worktree_extension() -> crate::Result {
87-
let git_dir = git_testtools::scripted_fixture_repo_read_only("config_with_worktree_extension.sh")?
87+
let git_dir = git_testtools::scripted_fixture_read_only("config_with_worktree_extension.sh")?
8888
.join("main-worktree")
8989
.join(".git");
9090
let config = git_config::File::from_git_dir(git_dir)?;

git-date/tests/time/baseline.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct Sample {
1313

1414
static BASELINE: Lazy<HashMap<String, Sample>> = Lazy::new(|| {
1515
(|| -> Result<_> {
16-
let base = git_testtools::scripted_fixture_repo_read_only("generate_git_date_baseline.sh")?;
16+
let base = git_testtools::scripted_fixture_read_only("generate_git_date_baseline.sh")?;
1717
let mut map = HashMap::new();
1818
let file = std::fs::read(base.join("baseline.git"))?;
1919
let baseline = std::str::from_utf8(&file).expect("valid utf");

git-diff/tests/tree/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ mod changes {
1111

1212
fn db(args: impl IntoIterator<Item = &'static str>) -> crate::Result<git_odb::Handle> {
1313
git_odb::at(
14-
git_testtools::scripted_fixture_repo_read_only_with_args("make_diff_repo.sh", args)?
14+
git_testtools::scripted_fixture_read_only_with_args("make_diff_repo.sh", args)?
1515
.join(".git")
1616
.join("objects"),
1717
)

git-discover/tests/is_git/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ fn verify_on_exfat() -> crate::Result<()> {
77

88
use git_discover::repository::Kind;
99

10-
let fixtures = git_testtools::scripted_fixture_repo_read_only("make_exfat_repo_darwin.sh")?;
10+
let fixtures = git_testtools::scripted_fixture_read_only("make_exfat_repo_darwin.sh")?;
1111
let mount_point = tempfile::tempdir()?;
1212

1313
let _cleanup = {
@@ -54,7 +54,7 @@ fn missing_configuration_file_is_not_a_dealbreaker_in_bare_repo() -> crate::Resu
5454
fn missing_configuration_file_is_not_a_dealbreaker_in_nonbare_repo() -> crate::Result {
5555
for name in ["worktree-no-config-after-init/.git", "worktree-no-config/.git"] {
5656
let repo = repo_path()?.join(name);
57-
let kind = git_discover::is_git(&repo)?;
57+
let kind = git_discover::is_git(repo)?;
5858
assert_eq!(kind, git_discover::repository::Kind::WorkTree { linked_git_dir: None });
5959
}
6060
Ok(())

git-discover/tests/isolated.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use serial_test::serial;
66
#[test]
77
#[serial]
88
fn upwards_with_relative_directories_and_optional_ceiling() -> git_testtools::Result {
9-
let repo = git_testtools::scripted_fixture_repo_read_only("make_basic_repo.sh")?;
9+
let repo = git_testtools::scripted_fixture_read_only("make_basic_repo.sh")?;
1010

1111
std::env::set_current_dir(repo.join("subdir"))?;
1212
let cwd = std::env::current_dir()?;

0 commit comments

Comments
 (0)