From c93572e462137f190eb57450303e83eabf8205a4 Mon Sep 17 00:00:00 2001 From: Nico Wagner Date: Mon, 2 Sep 2024 07:56:20 +0200 Subject: [PATCH 1/3] Move `pica-record` crate to root directory (#813) Signed-off-by: Nico Wagner --- .github/workflows/ci.yml | 2 +- Cargo.toml | 4 ++-- {crates/pica-record => pica-record}/Cargo.toml | 0 {crates/pica-record => pica-record}/benches/main.rs | 0 {crates/pica-record => pica-record}/fuzz/.gitignore | 0 {crates/pica-record => pica-record}/fuzz/Cargo.toml | 0 .../fuzz/fuzz_targets/fuzz_record_ref.rs | 0 {crates/pica-record => pica-record}/src/error.rs | 0 {crates/pica-record => pica-record}/src/field.rs | 0 {crates/pica-record => pica-record}/src/io/mod.rs | 0 {crates/pica-record => pica-record}/src/io/reader.rs | 0 {crates/pica-record => pica-record}/src/io/writer.rs | 0 {crates/pica-record => pica-record}/src/level.rs | 0 {crates/pica-record => pica-record}/src/lib.rs | 0 {crates/pica-record => pica-record}/src/occurrence.rs | 0 {crates/pica-record => pica-record}/src/record.rs | 0 {crates/pica-record => pica-record}/src/subfield.rs | 0 {crates/pica-record => pica-record}/src/tag.rs | 0 {crates/pica-record => pica-record}/tests/field/mod.rs | 0 .../pica-record => pica-record}/tests/integration_tests.rs | 0 {crates/pica-record => pica-record}/tests/level/mod.rs | 0 {crates/pica-record => pica-record}/tests/occurrence/mod.rs | 0 {crates/pica-record => pica-record}/tests/reader/mod.rs | 2 +- {crates/pica-record => pica-record}/tests/record/mod.rs | 0 {crates/pica-record => pica-record}/tests/subfield/mod.rs | 0 {crates/pica-record => pica-record}/tests/tag/mod.rs | 0 {crates/pica-record => pica-record}/tests/writer/mod.rs | 0 27 files changed, 4 insertions(+), 4 deletions(-) rename {crates/pica-record => pica-record}/Cargo.toml (100%) rename {crates/pica-record => pica-record}/benches/main.rs (100%) rename {crates/pica-record => pica-record}/fuzz/.gitignore (100%) rename {crates/pica-record => pica-record}/fuzz/Cargo.toml (100%) rename {crates/pica-record => pica-record}/fuzz/fuzz_targets/fuzz_record_ref.rs (100%) rename {crates/pica-record => pica-record}/src/error.rs (100%) rename {crates/pica-record => pica-record}/src/field.rs (100%) rename {crates/pica-record => pica-record}/src/io/mod.rs (100%) rename {crates/pica-record => pica-record}/src/io/reader.rs (100%) rename {crates/pica-record => pica-record}/src/io/writer.rs (100%) rename {crates/pica-record => pica-record}/src/level.rs (100%) rename {crates/pica-record => pica-record}/src/lib.rs (100%) rename {crates/pica-record => pica-record}/src/occurrence.rs (100%) rename {crates/pica-record => pica-record}/src/record.rs (100%) rename {crates/pica-record => pica-record}/src/subfield.rs (100%) rename {crates/pica-record => pica-record}/src/tag.rs (100%) rename {crates/pica-record => pica-record}/tests/field/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/integration_tests.rs (100%) rename {crates/pica-record => pica-record}/tests/level/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/occurrence/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/reader/mod.rs (96%) rename {crates/pica-record => pica-record}/tests/record/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/subfield/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/tag/mod.rs (100%) rename {crates/pica-record => pica-record}/tests/writer/mod.rs (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf58f721f..5c0edde34 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -92,7 +92,7 @@ jobs: - { name: pica-format, fuzz-dir: crates/pica-format/fuzz, target: fuzz-format, max-total-time: 300 } - { name: pica-path, fuzz-dir: crates/pica-path/fuzz, target: fuzz-path, max-total-time: 300 } - { name: pica-record-matcher, fuzz-dir: crates/pica-matcher/fuzz, target: fuzz-record-matcher, max-total-time: 300 } - - { name: pica-record-ref, fuzz-dir: crates/pica-record/fuzz, target: fuzz-record-ref, max-total-time: 300 } + - { name: pica-record-ref, fuzz-dir: pica-record/fuzz, target: fuzz-record-ref, max-total-time: 300 } - { name: pica-select-query, fuzz-dir: crates/pica-select/fuzz, target: fuzz-query, max-total-time: 300 } steps: - uses: actions/checkout@v4 diff --git a/Cargo.toml b/Cargo.toml index bfa3db4c3..0e5b12219 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "crates/pica-lint", "crates/pica-matcher", "crates/pica-path", - "crates/pica-record", + "pica-record", "crates/pica-select", "crates/pica-toolkit", "crates/pica-utils" @@ -26,7 +26,7 @@ rust-version = "1.76" pica-format = { version = "0.1", path = "./crates/pica-format" } pica-matcher = { version = "0.25", path = "./crates/pica-matcher" } pica-path = { version = "0.25", path = "./crates/pica-path" } -pica-record = { version = "0.25", path = "./crates/pica-record" } +pica-record = { version = "0.25", path = "./pica-record" } pica-select = { version = "0.25", path = "./crates/pica-select" } pica-utils = { version = "0.25", path = "./crates/pica-utils" } diff --git a/crates/pica-record/Cargo.toml b/pica-record/Cargo.toml similarity index 100% rename from crates/pica-record/Cargo.toml rename to pica-record/Cargo.toml diff --git a/crates/pica-record/benches/main.rs b/pica-record/benches/main.rs similarity index 100% rename from crates/pica-record/benches/main.rs rename to pica-record/benches/main.rs diff --git a/crates/pica-record/fuzz/.gitignore b/pica-record/fuzz/.gitignore similarity index 100% rename from crates/pica-record/fuzz/.gitignore rename to pica-record/fuzz/.gitignore diff --git a/crates/pica-record/fuzz/Cargo.toml b/pica-record/fuzz/Cargo.toml similarity index 100% rename from crates/pica-record/fuzz/Cargo.toml rename to pica-record/fuzz/Cargo.toml diff --git a/crates/pica-record/fuzz/fuzz_targets/fuzz_record_ref.rs b/pica-record/fuzz/fuzz_targets/fuzz_record_ref.rs similarity index 100% rename from crates/pica-record/fuzz/fuzz_targets/fuzz_record_ref.rs rename to pica-record/fuzz/fuzz_targets/fuzz_record_ref.rs diff --git a/crates/pica-record/src/error.rs b/pica-record/src/error.rs similarity index 100% rename from crates/pica-record/src/error.rs rename to pica-record/src/error.rs diff --git a/crates/pica-record/src/field.rs b/pica-record/src/field.rs similarity index 100% rename from crates/pica-record/src/field.rs rename to pica-record/src/field.rs diff --git a/crates/pica-record/src/io/mod.rs b/pica-record/src/io/mod.rs similarity index 100% rename from crates/pica-record/src/io/mod.rs rename to pica-record/src/io/mod.rs diff --git a/crates/pica-record/src/io/reader.rs b/pica-record/src/io/reader.rs similarity index 100% rename from crates/pica-record/src/io/reader.rs rename to pica-record/src/io/reader.rs diff --git a/crates/pica-record/src/io/writer.rs b/pica-record/src/io/writer.rs similarity index 100% rename from crates/pica-record/src/io/writer.rs rename to pica-record/src/io/writer.rs diff --git a/crates/pica-record/src/level.rs b/pica-record/src/level.rs similarity index 100% rename from crates/pica-record/src/level.rs rename to pica-record/src/level.rs diff --git a/crates/pica-record/src/lib.rs b/pica-record/src/lib.rs similarity index 100% rename from crates/pica-record/src/lib.rs rename to pica-record/src/lib.rs diff --git a/crates/pica-record/src/occurrence.rs b/pica-record/src/occurrence.rs similarity index 100% rename from crates/pica-record/src/occurrence.rs rename to pica-record/src/occurrence.rs diff --git a/crates/pica-record/src/record.rs b/pica-record/src/record.rs similarity index 100% rename from crates/pica-record/src/record.rs rename to pica-record/src/record.rs diff --git a/crates/pica-record/src/subfield.rs b/pica-record/src/subfield.rs similarity index 100% rename from crates/pica-record/src/subfield.rs rename to pica-record/src/subfield.rs diff --git a/crates/pica-record/src/tag.rs b/pica-record/src/tag.rs similarity index 100% rename from crates/pica-record/src/tag.rs rename to pica-record/src/tag.rs diff --git a/crates/pica-record/tests/field/mod.rs b/pica-record/tests/field/mod.rs similarity index 100% rename from crates/pica-record/tests/field/mod.rs rename to pica-record/tests/field/mod.rs diff --git a/crates/pica-record/tests/integration_tests.rs b/pica-record/tests/integration_tests.rs similarity index 100% rename from crates/pica-record/tests/integration_tests.rs rename to pica-record/tests/integration_tests.rs diff --git a/crates/pica-record/tests/level/mod.rs b/pica-record/tests/level/mod.rs similarity index 100% rename from crates/pica-record/tests/level/mod.rs rename to pica-record/tests/level/mod.rs diff --git a/crates/pica-record/tests/occurrence/mod.rs b/pica-record/tests/occurrence/mod.rs similarity index 100% rename from crates/pica-record/tests/occurrence/mod.rs rename to pica-record/tests/occurrence/mod.rs diff --git a/crates/pica-record/tests/reader/mod.rs b/pica-record/tests/reader/mod.rs similarity index 96% rename from crates/pica-record/tests/reader/mod.rs rename to pica-record/tests/reader/mod.rs index d984ed797..2be232ffa 100644 --- a/crates/pica-record/tests/reader/mod.rs +++ b/pica-record/tests/reader/mod.rs @@ -34,7 +34,7 @@ fn reader_builder_from_reader() { #[test] fn reader_builder_from_path() { let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")) - .join("../../tests/data/DUMP.dat.gz"); + .join("../tests/data/DUMP.dat.gz"); let mut reader = ReaderBuilder::new().from_path(path).unwrap(); let mut count = 0; diff --git a/crates/pica-record/tests/record/mod.rs b/pica-record/tests/record/mod.rs similarity index 100% rename from crates/pica-record/tests/record/mod.rs rename to pica-record/tests/record/mod.rs diff --git a/crates/pica-record/tests/subfield/mod.rs b/pica-record/tests/subfield/mod.rs similarity index 100% rename from crates/pica-record/tests/subfield/mod.rs rename to pica-record/tests/subfield/mod.rs diff --git a/crates/pica-record/tests/tag/mod.rs b/pica-record/tests/tag/mod.rs similarity index 100% rename from crates/pica-record/tests/tag/mod.rs rename to pica-record/tests/tag/mod.rs diff --git a/crates/pica-record/tests/writer/mod.rs b/pica-record/tests/writer/mod.rs similarity index 100% rename from crates/pica-record/tests/writer/mod.rs rename to pica-record/tests/writer/mod.rs From 3f672091c4e5a030a0e6994b93c93efc0f31b15f Mon Sep 17 00:00:00 2001 From: Nico Wagner Date: Mon, 2 Sep 2024 08:13:14 +0200 Subject: [PATCH 2/3] Bump to Rust 1.80.0 (#815) Signed-off-by: Nico Wagner --- .github/workflows/ci.yml | 8 ++++---- Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c0edde34..ec6c8478e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,15 +33,15 @@ jobs: matrix: target: - { os: ubuntu-latest, toolchain: stable, triple: x86_64-unknown-linux-gnu } - - { os: ubuntu-latest, toolchain: 1.76, triple: x86_64-unknown-linux-gnu } + - { os: ubuntu-latest, toolchain: 1.80.0, triple: x86_64-unknown-linux-gnu } - { os: ubuntu-latest, toolchain: beta, triple: x86_64-unknown-linux-gnu } - { os: ubuntu-latest, toolchain: nightly, triple: x86_64-unknown-linux-gnu } - { os: macos-latest, toolchain: stable, triple: x86_64-apple-darwin } - - { os: macos-latest, toolchain: 1.76, triple: x86_64-apple-darwin } + - { os: macos-latest, toolchain: 1.80.0, triple: x86_64-apple-darwin } - { os: windows-latest, toolchain: stable, triple: x86_64-pc-windows-gnu } - - { os: windows-latest, toolchain: 1.76, triple: x86_64-pc-windows-gnu } + - { os: windows-latest, toolchain: 1.80.0, triple: x86_64-pc-windows-gnu } - { os: windows-latest, toolchain: stable, triple: i686-pc-windows-msvc } - - { os: windows-latest, toolchain: 1.76, triple: i686-pc-windows-msvc } + - { os: windows-latest, toolchain: 1.80.0, triple: i686-pc-windows-msvc } runs-on: ${{ matrix.target.os }} steps: - uses: actions/checkout@v4 diff --git a/Cargo.toml b/Cargo.toml index 0e5b12219..0ee873f13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ license = "EUPL-1.2" readme = "./README.md" keywords = ["PICA+", "code4lib"] edition = "2021" -rust-version = "1.76" +rust-version = "1.80" [workspace.dependencies] pica-format = { version = "0.1", path = "./crates/pica-format" } From 28627c70f957e87a176db69e1d0b10bfd17b0c8b Mon Sep 17 00:00:00 2001 From: Nico Wagner Date: Mon, 2 Sep 2024 08:33:54 +0200 Subject: [PATCH 3/3] Fix elided named lifetimes error (#814) Signed-off-by: Nico Wagner --- crates/pica-toolkit/src/commands/explode.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/pica-toolkit/src/commands/explode.rs b/crates/pica-toolkit/src/commands/explode.rs index 42bda5335..2921f2849 100644 --- a/crates/pica-toolkit/src/commands/explode.rs +++ b/crates/pica-toolkit/src/commands/explode.rs @@ -131,7 +131,7 @@ fn process_main<'a>( fn process_local<'a>( record: &'a ByteRecord<'a>, -) -> Vec>> { +) -> Vec>> { let mut iter = record.iter().peekable(); let mut records = vec![]; let mut main = vec![]; @@ -160,7 +160,7 @@ fn process_local<'a>( fn process_copy<'a>( record: &'a ByteRecord<'a>, -) -> Vec>> { +) -> Vec>> { let mut iter = record.iter().peekable(); let mut records = vec![]; let mut main = vec![];