Merge remote-tracking branch 'origin/main' into subfield-code

deutsche-nationalbibliothek · Sep 2, 2024 · b8eea77 · b8eea77
2 parents ce4decd + 28627c7
commit b8eea77
Show file tree

Hide file tree

Showing 28 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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"
@@ -20,13 +20,13 @@ 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" }
 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-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<&FieldRef<'a>>> {
+) -> Vec<Vec<&'a FieldRef<'a>>> {
     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<&FieldRef<'a>>> {
+) -> Vec<Vec<&'a FieldRef<'a>>> {
     let mut iter = record.iter().peekable();
     let mut records = vec![];
     let mut main = vec![];

diff --git a/crates/pica-record/Cargo.toml → pica-record/Cargo.toml b/crates/pica-record/Cargo.toml → pica-record/Cargo.toml
diff --git a/crates/pica-record/benches/main.rs → pica-record/benches/main.rs b/crates/pica-record/benches/main.rs → pica-record/benches/main.rs
diff --git a/crates/pica-record/fuzz/.gitignore → pica-record/fuzz/.gitignore b/crates/pica-record/fuzz/.gitignore → pica-record/fuzz/.gitignore
diff --git a/crates/pica-record/fuzz/Cargo.toml → pica-record/fuzz/Cargo.toml b/crates/pica-record/fuzz/Cargo.toml → pica-record/fuzz/Cargo.toml
diff --git a/...cord/fuzz/fuzz_targets/fuzz_record_ref.rs → ...cord/fuzz/fuzz_targets/fuzz_record_ref.rs b/...cord/fuzz/fuzz_targets/fuzz_record_ref.rs → ...cord/fuzz/fuzz_targets/fuzz_record_ref.rs
diff --git a/crates/pica-record/src/error.rs → pica-record/src/error.rs b/crates/pica-record/src/error.rs → pica-record/src/error.rs
diff --git a/crates/pica-record/src/field.rs → pica-record/src/field.rs b/crates/pica-record/src/field.rs → pica-record/src/field.rs
diff --git a/crates/pica-record/src/io/mod.rs → pica-record/src/io/mod.rs b/crates/pica-record/src/io/mod.rs → pica-record/src/io/mod.rs
diff --git a/crates/pica-record/src/io/reader.rs → pica-record/src/io/reader.rs b/crates/pica-record/src/io/reader.rs → pica-record/src/io/reader.rs
diff --git a/crates/pica-record/src/io/writer.rs → pica-record/src/io/writer.rs b/crates/pica-record/src/io/writer.rs → pica-record/src/io/writer.rs
diff --git a/crates/pica-record/src/level.rs → pica-record/src/level.rs b/crates/pica-record/src/level.rs → pica-record/src/level.rs
diff --git a/crates/pica-record/src/lib.rs → pica-record/src/lib.rs b/crates/pica-record/src/lib.rs → pica-record/src/lib.rs
diff --git a/crates/pica-record/src/occurrence.rs → pica-record/src/occurrence.rs b/crates/pica-record/src/occurrence.rs → pica-record/src/occurrence.rs
diff --git a/crates/pica-record/src/record.rs → pica-record/src/record.rs b/crates/pica-record/src/record.rs → pica-record/src/record.rs
diff --git a/crates/pica-record/src/subfield.rs → pica-record/src/subfield.rs b/crates/pica-record/src/subfield.rs → pica-record/src/subfield.rs
diff --git a/crates/pica-record/src/tag.rs → pica-record/src/tag.rs b/crates/pica-record/src/tag.rs → pica-record/src/tag.rs
diff --git a/crates/pica-record/tests/field/mod.rs → pica-record/tests/field/mod.rs b/crates/pica-record/tests/field/mod.rs → pica-record/tests/field/mod.rs
diff --git a/...es/pica-record/tests/integration_tests.rs → pica-record/tests/integration_tests.rs b/...es/pica-record/tests/integration_tests.rs → pica-record/tests/integration_tests.rs
diff --git a/crates/pica-record/tests/level/mod.rs → pica-record/tests/level/mod.rs b/crates/pica-record/tests/level/mod.rs → pica-record/tests/level/mod.rs
diff --git a/crates/pica-record/tests/occurrence/mod.rs → pica-record/tests/occurrence/mod.rs b/crates/pica-record/tests/occurrence/mod.rs → pica-record/tests/occurrence/mod.rs
diff --git a/crates/pica-record/tests/reader/mod.rs → pica-record/tests/reader/mod.rs b/crates/pica-record/tests/reader/mod.rs → 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 → pica-record/tests/record/mod.rs b/crates/pica-record/tests/record/mod.rs → pica-record/tests/record/mod.rs
diff --git a/crates/pica-record/tests/subfield/mod.rs → pica-record/tests/subfield/mod.rs b/crates/pica-record/tests/subfield/mod.rs → pica-record/tests/subfield/mod.rs
diff --git a/crates/pica-record/tests/tag/mod.rs → pica-record/tests/tag/mod.rs b/crates/pica-record/tests/tag/mod.rs → pica-record/tests/tag/mod.rs
diff --git a/crates/pica-record/tests/writer/mod.rs → pica-record/tests/writer/mod.rs b/crates/pica-record/tests/writer/mod.rs → pica-record/tests/writer/mod.rs