From 0c7ec6e72c44e5480559ec3109db45a7e6c4eb17 Mon Sep 17 00:00:00 2001 From: MrCroxx Date: Thu, 26 Sep 2024 07:46:46 +0000 Subject: [PATCH] chore: use workspace.package to manage crate meta Besides, replace all "Foyer" with "foyer". Signed-off-by: MrCroxx --- .licenserc.yaml | 2 +- Cargo.toml | 17 +++++++++++++ LICENSE | 2 +- examples/Cargo.toml | 22 ++++++++-------- examples/event_listener.rs | 2 +- examples/hybrid.rs | 2 +- examples/hybrid_full.rs | 2 +- examples/memory.rs | 2 +- examples/tail_based_tracing.rs | 2 +- foyer-bench/Cargo.toml | 20 ++++++++------- foyer-bench/src/analyze.rs | 2 +- foyer-bench/src/main.rs | 2 +- foyer-bench/src/rate.rs | 2 +- foyer-bench/src/text.rs | 2 +- foyer-cli/Cargo.toml | 19 ++++++++------ foyer-cli/src/args/error.rs | 2 +- foyer-cli/src/args/fio.rs | 2 +- foyer-cli/src/args/mod.rs | 2 +- foyer-cli/src/main.rs | 2 +- foyer-common/Cargo.toml | 18 +++++++------ foyer-common/src/assert.rs | 2 +- foyer-common/src/asyncify.rs | 2 +- foyer-common/src/bits.rs | 2 +- foyer-common/src/buf.rs | 2 +- foyer-common/src/code.rs | 2 +- foyer-common/src/countdown.rs | 2 +- foyer-common/src/event.rs | 2 +- foyer-common/src/future.rs | 2 +- foyer-common/src/lib.rs | 2 +- foyer-common/src/metrics.rs | 2 +- foyer-common/src/object_pool.rs | 2 +- foyer-common/src/range.rs | 2 +- foyer-common/src/rate.rs | 2 +- foyer-common/src/rated_ticket.rs | 2 +- foyer-common/src/runtime.rs | 2 +- foyer-common/src/tracing.rs | 2 +- foyer-common/src/wait_group.rs | 2 +- foyer-intrusive/Cargo.toml | 20 ++++++++------- foyer-intrusive/src/adapter.rs | 2 +- foyer-intrusive/src/dlist.rs | 2 +- foyer-intrusive/src/lib.rs | 2 +- foyer-memory/Cargo.toml | 22 ++++++++-------- .../benches/bench_dynamic_dispatch.rs | 2 +- foyer-memory/benches/bench_hit_ratio.rs | 2 +- foyer-memory/src/cache.rs | 4 +-- foyer-memory/src/context.rs | 2 +- foyer-memory/src/eviction/fifo.rs | 2 +- foyer-memory/src/eviction/lfu.rs | 2 +- foyer-memory/src/eviction/lru.rs | 2 +- foyer-memory/src/eviction/mod.rs | 2 +- foyer-memory/src/eviction/s3fifo.rs | 2 +- foyer-memory/src/eviction/sanity.rs | 2 +- foyer-memory/src/eviction/test_utils.rs | 2 +- foyer-memory/src/generic.rs | 2 +- foyer-memory/src/handle.rs | 2 +- foyer-memory/src/indexer/hash_table.rs | 2 +- foyer-memory/src/indexer/mod.rs | 2 +- foyer-memory/src/indexer/sanity.rs | 2 +- foyer-memory/src/lib.rs | 2 +- foyer-memory/src/prelude.rs | 2 +- foyer-storage/Cargo.toml | 22 ++++++++-------- foyer-storage/src/compress.rs | 2 +- foyer-storage/src/device/allocator.rs | 2 +- foyer-storage/src/device/bytes.rs | 2 +- foyer-storage/src/device/direct_file.rs | 2 +- foyer-storage/src/device/direct_fs.rs | 2 +- foyer-storage/src/device/mod.rs | 2 +- foyer-storage/src/device/monitor.rs | 2 +- foyer-storage/src/engine.rs | 2 +- foyer-storage/src/error.rs | 2 +- foyer-storage/src/io_buffer_pool.rs | 2 +- foyer-storage/src/large/batch.rs | 2 +- foyer-storage/src/large/flusher.rs | 2 +- foyer-storage/src/large/generic.rs | 2 +- foyer-storage/src/large/indexer.rs | 2 +- foyer-storage/src/large/mod.rs | 2 +- foyer-storage/src/large/reclaimer.rs | 2 +- foyer-storage/src/large/recover.rs | 2 +- foyer-storage/src/large/scanner.rs | 2 +- foyer-storage/src/large/serde.rs | 2 +- foyer-storage/src/large/tombstone.rs | 2 +- foyer-storage/src/lib.rs | 2 +- foyer-storage/src/picker/mod.rs | 2 +- foyer-storage/src/picker/utils.rs | 2 +- foyer-storage/src/prelude.rs | 2 +- foyer-storage/src/region.rs | 2 +- foyer-storage/src/runtime.rs | 2 +- foyer-storage/src/serde.rs | 2 +- foyer-storage/src/small/batch.rs | 2 +- foyer-storage/src/small/bloom_filter.rs | 2 +- foyer-storage/src/small/flusher.rs | 2 +- foyer-storage/src/small/generic.rs | 2 +- foyer-storage/src/small/mod.rs | 2 +- foyer-storage/src/small/serde.rs | 2 +- foyer-storage/src/small/set.rs | 2 +- foyer-storage/src/small/set_manager.rs | 2 +- foyer-storage/src/statistics.rs | 2 +- foyer-storage/src/storage/either.rs | 2 +- foyer-storage/src/storage/mod.rs | 2 +- foyer-storage/src/storage/noop.rs | 2 +- foyer-storage/src/store.rs | 4 +-- foyer-storage/src/test_utils.rs | 2 +- foyer-storage/tests/storage_test.rs | 2 +- foyer-util/Cargo.toml | 20 ++++++++------- foyer-util/src/async_batch_pipeline.rs | 2 +- foyer-util/src/batch.rs | 2 +- foyer-util/src/compact_bloom_filter.rs | 2 +- foyer-util/src/continuum.rs | 2 +- foyer-util/src/erwlock.rs | 2 +- foyer-util/src/iostat.rs | 2 +- foyer-util/src/judge.rs | 2 +- foyer-util/src/lib.rs | 2 +- foyer-util/src/slab/mod.rs | 2 +- foyer-util/src/slab/slab_linked_list/mod.rs | 2 +- foyer-util/src/slab/slab_linked_list/tests.rs | 2 +- foyer-util/src/slab/tests.rs | 2 +- foyer/Cargo.toml | 25 ++++++++++--------- foyer/src/hybrid/builder.rs | 4 +-- foyer/src/hybrid/cache.rs | 2 +- foyer/src/hybrid/mod.rs | 2 +- foyer/src/hybrid/writer.rs | 2 +- foyer/src/lib.rs | 2 +- foyer/src/prelude.rs | 2 +- 123 files changed, 236 insertions(+), 201 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml index bfb4ceb2..0bdd2646 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -1,7 +1,7 @@ header: license: spdx-id: Apache-2.0 - copyright-owner: Foyer Project Authors + copyright-owner: foyer Project Authors paths: - "**/*.rs" diff --git a/Cargo.toml b/Cargo.toml index 367bb99b..f917c84b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,17 @@ members = [ "foyer-util", ] +[workspace.package] +version = "0.12.0-dev" +edition = "2021" +rust-version = "1.81.0" +repository = "https://github.com/foyer-rs/foyer" +homepage = "https://foyer.rs" +keywords = ["cache", "hybrid"] +authors = ["MrCroxx "] +license = "Apache-2.0" +readme = "README.md" + [workspace.dependencies] tokio = { package = "madsim-tokio", version = "0.2", features = [ "rt", @@ -34,6 +45,12 @@ fastrace-jaeger = "0.7" fastrace-opentelemetry = "0.7" clap = { version = "4", features = ["derive"] } bytesize = { package = "foyer-bytesize", version = "2" } +# foyer components +foyer-common = { version = "0.12.0-dev", path = "foyer-common" } +foyer-intrusive = { version = "0.12.0-dev", path = "foyer-intrusive" } +foyer-memory = { version = "0.12.0-dev", path = "foyer-memory" } +foyer-storage = { version = "0.12.0-dev", path = "foyer-storage" } +foyer = { version = "0.12.0-dev", path = "foyer" } [profile.release] debug = true diff --git a/LICENSE b/LICENSE index 7e01351a..48b5e9ab 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2024 Foyer Project Authors + Copyright 2024 foyer Project Authors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 2584ca5f..a0b38593 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -1,15 +1,17 @@ [package] name = "examples" -version = "0.0.0" -edition = "2021" -authors = ["MrCroxx "] -description = "Hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +description = "examples for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } publish = false +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] ahash = "0.8" @@ -18,7 +20,7 @@ chrono = "0.4" fastrace = { workspace = true } fastrace-jaeger = { workspace = true, optional = true } fastrace-opentelemetry = { workspace = true, optional = true } -foyer = { version = "*", path = "../foyer" } +foyer = { workspace = true } opentelemetry = { version = "0.25", optional = true } opentelemetry-otlp = { version = "0.25", optional = true } opentelemetry-semantic-conventions = { version = "0.25", optional = true } diff --git a/examples/event_listener.rs b/examples/event_listener.rs index 4b905b8e..f7de1674 100644 --- a/examples/event_listener.rs +++ b/examples/event_listener.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/examples/hybrid.rs b/examples/hybrid.rs index 2bf7a450..fe15af3f 100644 --- a/examples/hybrid.rs +++ b/examples/hybrid.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/examples/hybrid_full.rs b/examples/hybrid_full.rs index 60cafb8e..acdf3d40 100644 --- a/examples/hybrid_full.rs +++ b/examples/hybrid_full.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/examples/memory.rs b/examples/memory.rs index e18d2892..389c1ae2 100644 --- a/examples/memory.rs +++ b/examples/memory.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/examples/tail_based_tracing.rs b/examples/tail_based_tracing.rs index 171aebea..254e4377 100644 --- a/examples/tail_based_tracing.rs +++ b/examples/tail_based_tracing.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-bench/Cargo.toml b/foyer-bench/Cargo.toml index 22d397fc..6c641de7 100644 --- a/foyer-bench/Cargo.toml +++ b/foyer-bench/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "foyer-bench" -version = "0.3.5" -edition = "2021" -authors = ["MrCroxx "] -description = "bench tool for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "bench tool for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -17,7 +19,7 @@ clap = { workspace = true } console-subscriber = { version = "0.4", optional = true } fastrace = { workspace = true, optional = true } fastrace-jaeger = { workspace = true, optional = true } -foyer = { version = "0.11.5", path = "../foyer" } +foyer = { workspace = true } futures = "0.3" hdrhistogram = "7" itertools = { workspace = true } diff --git a/foyer-bench/src/analyze.rs b/foyer-bench/src/analyze.rs index 395ad949..50ecc7a6 100644 --- a/foyer-bench/src/analyze.rs +++ b/foyer-bench/src/analyze.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-bench/src/main.rs b/foyer-bench/src/main.rs index 87587bb5..0a0ef321 100644 --- a/foyer-bench/src/main.rs +++ b/foyer-bench/src/main.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-bench/src/rate.rs b/foyer-bench/src/rate.rs index e7d86a34..7cfe284e 100644 --- a/foyer-bench/src/rate.rs +++ b/foyer-bench/src/rate.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-bench/src/text.rs b/foyer-bench/src/text.rs index 2ec8f8f2..1b53a2e0 100644 --- a/foyer-bench/src/text.rs +++ b/foyer-bench/src/text.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-cli/Cargo.toml b/foyer-cli/Cargo.toml index 707677ff..7112d357 100644 --- a/foyer-cli/Cargo.toml +++ b/foyer-cli/Cargo.toml @@ -1,13 +1,16 @@ [package] name = "foyer-cli" -version = "0.0.0" -edition = "2021" -authors = ["MrCroxx "] -description = "Hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "cli tool for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } +publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/foyer-cli/src/args/error.rs b/foyer-cli/src/args/error.rs index 4bd96da4..09bd03e3 100644 --- a/foyer-cli/src/args/error.rs +++ b/foyer-cli/src/args/error.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-cli/src/args/fio.rs b/foyer-cli/src/args/fio.rs index 5a087bdd..2a687ea8 100644 --- a/foyer-cli/src/args/fio.rs +++ b/foyer-cli/src/args/fio.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-cli/src/args/mod.rs b/foyer-cli/src/args/mod.rs index 5c5e4dd1..bb8e3862 100644 --- a/foyer-cli/src/args/mod.rs +++ b/foyer-cli/src/args/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-cli/src/main.rs b/foyer-cli/src/main.rs index da1dee74..081289f8 100644 --- a/foyer-cli/src/main.rs +++ b/foyer-cli/src/main.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/Cargo.toml b/foyer-common/Cargo.toml index 3e64b1f5..c416d6cd 100644 --- a/foyer-common/Cargo.toml +++ b/foyer-common/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "foyer-common" -version = "0.9.5" -edition = "2021" -authors = ["MrCroxx "] -description = "common components for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "common components for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] diff --git a/foyer-common/src/assert.rs b/foyer-common/src/assert.rs index 8f15f3da..8e2a744f 100644 --- a/foyer-common/src/assert.rs +++ b/foyer-common/src/assert.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/asyncify.rs b/foyer-common/src/asyncify.rs index ba441b49..8b62f302 100644 --- a/foyer-common/src/asyncify.rs +++ b/foyer-common/src/asyncify.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/bits.rs b/foyer-common/src/bits.rs index 0cc7c86b..f8ed230e 100644 --- a/foyer-common/src/bits.rs +++ b/foyer-common/src/bits.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/buf.rs b/foyer-common/src/buf.rs index da006a93..7e62228a 100644 --- a/foyer-common/src/buf.rs +++ b/foyer-common/src/buf.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/code.rs b/foyer-common/src/code.rs index ae4826e6..f1fbf3eb 100644 --- a/foyer-common/src/code.rs +++ b/foyer-common/src/code.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/countdown.rs b/foyer-common/src/countdown.rs index 1d80e319..c12b80f9 100644 --- a/foyer-common/src/countdown.rs +++ b/foyer-common/src/countdown.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/event.rs b/foyer-common/src/event.rs index 0c76edd9..f6d17070 100644 --- a/foyer-common/src/event.rs +++ b/foyer-common/src/event.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/future.rs b/foyer-common/src/future.rs index 5e9ec127..498fa853 100644 --- a/foyer-common/src/future.rs +++ b/foyer-common/src/future.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/lib.rs b/foyer-common/src/lib.rs index 208d9ee1..bff5d147 100644 --- a/foyer-common/src/lib.rs +++ b/foyer-common/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/metrics.rs b/foyer-common/src/metrics.rs index 0544551d..d8ea3adc 100644 --- a/foyer-common/src/metrics.rs +++ b/foyer-common/src/metrics.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/object_pool.rs b/foyer-common/src/object_pool.rs index 673030e9..9e4d6048 100644 --- a/foyer-common/src/object_pool.rs +++ b/foyer-common/src/object_pool.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/range.rs b/foyer-common/src/range.rs index 34d23aa4..0fae4d77 100644 --- a/foyer-common/src/range.rs +++ b/foyer-common/src/range.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/rate.rs b/foyer-common/src/rate.rs index 75fef3fc..ef9af776 100644 --- a/foyer-common/src/rate.rs +++ b/foyer-common/src/rate.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/rated_ticket.rs b/foyer-common/src/rated_ticket.rs index 34852930..026cdf2d 100644 --- a/foyer-common/src/rated_ticket.rs +++ b/foyer-common/src/rated_ticket.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/runtime.rs b/foyer-common/src/runtime.rs index a3727090..14be9c18 100644 --- a/foyer-common/src/runtime.rs +++ b/foyer-common/src/runtime.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/tracing.rs b/foyer-common/src/tracing.rs index 708b5208..057e9c50 100644 --- a/foyer-common/src/tracing.rs +++ b/foyer-common/src/tracing.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-common/src/wait_group.rs b/foyer-common/src/wait_group.rs index 855dee63..ae4f71bd 100644 --- a/foyer-common/src/wait_group.rs +++ b/foyer-common/src/wait_group.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-intrusive/Cargo.toml b/foyer-intrusive/Cargo.toml index a39927dd..85ce93b5 100644 --- a/foyer-intrusive/Cargo.toml +++ b/foyer-intrusive/Cargo.toml @@ -1,17 +1,19 @@ [package] name = "foyer-intrusive" -version = "0.9.5" -edition = "2021" -authors = ["MrCroxx "] -description = "intrusive data structures for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "intrusive data structures for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -foyer-common = { version = "0.9.5", path = "../foyer-common" } +foyer-common = { workspace = true } itertools = { workspace = true } [features] diff --git a/foyer-intrusive/src/adapter.rs b/foyer-intrusive/src/adapter.rs index 25063921..7a6a957a 100644 --- a/foyer-intrusive/src/adapter.rs +++ b/foyer-intrusive/src/adapter.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-intrusive/src/dlist.rs b/foyer-intrusive/src/dlist.rs index 71b20da6..04ecea48 100644 --- a/foyer-intrusive/src/dlist.rs +++ b/foyer-intrusive/src/dlist.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-intrusive/src/lib.rs b/foyer-intrusive/src/lib.rs index bf64ea7f..4ec6cca3 100644 --- a/foyer-intrusive/src/lib.rs +++ b/foyer-intrusive/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/Cargo.toml b/foyer-memory/Cargo.toml index dbb2a3a5..078fbe72 100644 --- a/foyer-memory/Cargo.toml +++ b/foyer-memory/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "foyer-memory" -version = "0.7.5" -edition = "2021" -authors = ["MrCroxx "] -description = "memory cache for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "memory cache for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -15,8 +17,8 @@ ahash = "0.8" bitflags = "2" cmsketch = "0.2.1" fastrace = { workspace = true } -foyer-common = { version = "0.9.5", path = "../foyer-common" } -foyer-intrusive = { version = "0.9.5", path = "../foyer-intrusive" } +foyer-common = { workspace = true } +foyer-intrusive = { workspace = true } futures = "0.3" hashbrown = "0.14" itertools = { workspace = true } diff --git a/foyer-memory/benches/bench_dynamic_dispatch.rs b/foyer-memory/benches/bench_dynamic_dispatch.rs index 144676b6..826643c5 100644 --- a/foyer-memory/benches/bench_dynamic_dispatch.rs +++ b/foyer-memory/benches/bench_dynamic_dispatch.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/benches/bench_hit_ratio.rs b/foyer-memory/benches/bench_hit_ratio.rs index fd49fd0f..be1fdb13 100644 --- a/foyer-memory/benches/bench_hit_ratio.rs +++ b/foyer-memory/benches/bench_hit_ratio.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/cache.rs b/foyer-memory/src/cache.rs index 6d8fc3c1..ab072a48 100644 --- a/foyer-memory/src/cache.rs +++ b/foyer-memory/src/cache.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -338,7 +338,7 @@ where { /// Set the name of the foyer in-memory cache instance. /// - /// Foyer will use the name as the prefix of the metric names. + /// foyer will use the name as the prefix of the metric names. /// /// Default: `foyer`. pub fn with_name(mut self, name: &str) -> Self { diff --git a/foyer-memory/src/context.rs b/foyer-memory/src/context.rs index eba7eff7..3af8ab18 100644 --- a/foyer-memory/src/context.rs +++ b/foyer-memory/src/context.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/fifo.rs b/foyer-memory/src/eviction/fifo.rs index 606e6065..a1e0d974 100644 --- a/foyer-memory/src/eviction/fifo.rs +++ b/foyer-memory/src/eviction/fifo.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/lfu.rs b/foyer-memory/src/eviction/lfu.rs index f17aaade..5ed7f21c 100644 --- a/foyer-memory/src/eviction/lfu.rs +++ b/foyer-memory/src/eviction/lfu.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/lru.rs b/foyer-memory/src/eviction/lru.rs index 54cdf2af..132df3c6 100644 --- a/foyer-memory/src/eviction/lru.rs +++ b/foyer-memory/src/eviction/lru.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/mod.rs b/foyer-memory/src/eviction/mod.rs index e8eaa5e9..fa7297be 100644 --- a/foyer-memory/src/eviction/mod.rs +++ b/foyer-memory/src/eviction/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/s3fifo.rs b/foyer-memory/src/eviction/s3fifo.rs index 1ae5d601..fcee8588 100644 --- a/foyer-memory/src/eviction/s3fifo.rs +++ b/foyer-memory/src/eviction/s3fifo.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/sanity.rs b/foyer-memory/src/eviction/sanity.rs index 176ede26..4d965a13 100644 --- a/foyer-memory/src/eviction/sanity.rs +++ b/foyer-memory/src/eviction/sanity.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/eviction/test_utils.rs b/foyer-memory/src/eviction/test_utils.rs index dd3f1f6f..be965799 100644 --- a/foyer-memory/src/eviction/test_utils.rs +++ b/foyer-memory/src/eviction/test_utils.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/generic.rs b/foyer-memory/src/generic.rs index 8d8d7094..60f57a6c 100644 --- a/foyer-memory/src/generic.rs +++ b/foyer-memory/src/generic.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/handle.rs b/foyer-memory/src/handle.rs index 4cca7464..9476cda2 100644 --- a/foyer-memory/src/handle.rs +++ b/foyer-memory/src/handle.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/indexer/hash_table.rs b/foyer-memory/src/indexer/hash_table.rs index b0837d72..19dc7d29 100644 --- a/foyer-memory/src/indexer/hash_table.rs +++ b/foyer-memory/src/indexer/hash_table.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/indexer/mod.rs b/foyer-memory/src/indexer/mod.rs index 0b6cf795..552ded1a 100644 --- a/foyer-memory/src/indexer/mod.rs +++ b/foyer-memory/src/indexer/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/indexer/sanity.rs b/foyer-memory/src/indexer/sanity.rs index d84b59ed..fcde9a5d 100644 --- a/foyer-memory/src/indexer/sanity.rs +++ b/foyer-memory/src/indexer/sanity.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/lib.rs b/foyer-memory/src/lib.rs index cf3e2fe3..afcb3d14 100644 --- a/foyer-memory/src/lib.rs +++ b/foyer-memory/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-memory/src/prelude.rs b/foyer-memory/src/prelude.rs index d1cd10ed..ee2925da 100644 --- a/foyer-memory/src/prelude.rs +++ b/foyer-memory/src/prelude.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/Cargo.toml b/foyer-storage/Cargo.toml index d77630d3..fab85a03 100644 --- a/foyer-storage/Cargo.toml +++ b/foyer-storage/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "foyer-storage" -version = "0.10.5" -edition = "2021" -authors = ["MrCroxx "] -description = "storage engine for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "storage engine for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] @@ -26,8 +28,8 @@ clap = { workspace = true } either = "1" fastrace = { workspace = true } flume = "0.11" -foyer-common = { version = "0.9.5", path = "../foyer-common" } -foyer-memory = { version = "0.7.5", path = "../foyer-memory" } +foyer-common = { workspace = true } +foyer-memory = { workspace = true } fs4 = "0.9.1" futures = "0.3" itertools = { workspace = true } diff --git a/foyer-storage/src/compress.rs b/foyer-storage/src/compress.rs index 94cc3281..04a43b0b 100644 --- a/foyer-storage/src/compress.rs +++ b/foyer-storage/src/compress.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/allocator.rs b/foyer-storage/src/device/allocator.rs index f2f2f6a1..52089125 100644 --- a/foyer-storage/src/device/allocator.rs +++ b/foyer-storage/src/device/allocator.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/bytes.rs b/foyer-storage/src/device/bytes.rs index 6a53e83a..d7dece75 100644 --- a/foyer-storage/src/device/bytes.rs +++ b/foyer-storage/src/device/bytes.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/direct_file.rs b/foyer-storage/src/device/direct_file.rs index cd6845a1..8c4ab1ff 100644 --- a/foyer-storage/src/device/direct_file.rs +++ b/foyer-storage/src/device/direct_file.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/direct_fs.rs b/foyer-storage/src/device/direct_fs.rs index 94fc3f11..4e1deb95 100644 --- a/foyer-storage/src/device/direct_fs.rs +++ b/foyer-storage/src/device/direct_fs.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/mod.rs b/foyer-storage/src/device/mod.rs index 26dfe5f7..998dbf25 100644 --- a/foyer-storage/src/device/mod.rs +++ b/foyer-storage/src/device/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/device/monitor.rs b/foyer-storage/src/device/monitor.rs index 3e338d1d..bf29227f 100644 --- a/foyer-storage/src/device/monitor.rs +++ b/foyer-storage/src/device/monitor.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/engine.rs b/foyer-storage/src/engine.rs index 6735315e..fc1a40bf 100644 --- a/foyer-storage/src/engine.rs +++ b/foyer-storage/src/engine.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/error.rs b/foyer-storage/src/error.rs index 87442e15..0ef2eb3c 100644 --- a/foyer-storage/src/error.rs +++ b/foyer-storage/src/error.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/io_buffer_pool.rs b/foyer-storage/src/io_buffer_pool.rs index cc6ceff2..d0796fa7 100644 --- a/foyer-storage/src/io_buffer_pool.rs +++ b/foyer-storage/src/io_buffer_pool.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/batch.rs b/foyer-storage/src/large/batch.rs index cacccfe6..602828fd 100644 --- a/foyer-storage/src/large/batch.rs +++ b/foyer-storage/src/large/batch.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/flusher.rs b/foyer-storage/src/large/flusher.rs index 1bcd9d95..4a789540 100644 --- a/foyer-storage/src/large/flusher.rs +++ b/foyer-storage/src/large/flusher.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/generic.rs b/foyer-storage/src/large/generic.rs index e08057c7..c501714a 100644 --- a/foyer-storage/src/large/generic.rs +++ b/foyer-storage/src/large/generic.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/indexer.rs b/foyer-storage/src/large/indexer.rs index 7ba536c9..db32810d 100644 --- a/foyer-storage/src/large/indexer.rs +++ b/foyer-storage/src/large/indexer.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/mod.rs b/foyer-storage/src/large/mod.rs index 4804f133..83d314c6 100644 --- a/foyer-storage/src/large/mod.rs +++ b/foyer-storage/src/large/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/reclaimer.rs b/foyer-storage/src/large/reclaimer.rs index e49f4b43..ac2ffb64 100644 --- a/foyer-storage/src/large/reclaimer.rs +++ b/foyer-storage/src/large/reclaimer.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/recover.rs b/foyer-storage/src/large/recover.rs index 007258a0..cc4bf827 100644 --- a/foyer-storage/src/large/recover.rs +++ b/foyer-storage/src/large/recover.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/scanner.rs b/foyer-storage/src/large/scanner.rs index 20f43309..bd4bb77d 100644 --- a/foyer-storage/src/large/scanner.rs +++ b/foyer-storage/src/large/scanner.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/serde.rs b/foyer-storage/src/large/serde.rs index 03ea69e1..51768dcf 100644 --- a/foyer-storage/src/large/serde.rs +++ b/foyer-storage/src/large/serde.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/large/tombstone.rs b/foyer-storage/src/large/tombstone.rs index 09a9ee27..3d61e803 100644 --- a/foyer-storage/src/large/tombstone.rs +++ b/foyer-storage/src/large/tombstone.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/lib.rs b/foyer-storage/src/lib.rs index ceb30ebb..7d5b2b6a 100644 --- a/foyer-storage/src/lib.rs +++ b/foyer-storage/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/picker/mod.rs b/foyer-storage/src/picker/mod.rs index 2657bf48..3e79c491 100644 --- a/foyer-storage/src/picker/mod.rs +++ b/foyer-storage/src/picker/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/picker/utils.rs b/foyer-storage/src/picker/utils.rs index fb793d5c..525328c5 100644 --- a/foyer-storage/src/picker/utils.rs +++ b/foyer-storage/src/picker/utils.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/prelude.rs b/foyer-storage/src/prelude.rs index ec0b94c8..ac221496 100644 --- a/foyer-storage/src/prelude.rs +++ b/foyer-storage/src/prelude.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/region.rs b/foyer-storage/src/region.rs index 6046bab6..fad51781 100644 --- a/foyer-storage/src/region.rs +++ b/foyer-storage/src/region.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/runtime.rs b/foyer-storage/src/runtime.rs index fc361cb5..a2266e90 100644 --- a/foyer-storage/src/runtime.rs +++ b/foyer-storage/src/runtime.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/serde.rs b/foyer-storage/src/serde.rs index 169e5377..a466cbba 100644 --- a/foyer-storage/src/serde.rs +++ b/foyer-storage/src/serde.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/batch.rs b/foyer-storage/src/small/batch.rs index 310aa156..8ca25f8d 100644 --- a/foyer-storage/src/small/batch.rs +++ b/foyer-storage/src/small/batch.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/bloom_filter.rs b/foyer-storage/src/small/bloom_filter.rs index 4cf98689..a2707ebe 100644 --- a/foyer-storage/src/small/bloom_filter.rs +++ b/foyer-storage/src/small/bloom_filter.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/flusher.rs b/foyer-storage/src/small/flusher.rs index 43e720a3..f95a440e 100644 --- a/foyer-storage/src/small/flusher.rs +++ b/foyer-storage/src/small/flusher.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/generic.rs b/foyer-storage/src/small/generic.rs index 3b088204..bbec7b45 100644 --- a/foyer-storage/src/small/generic.rs +++ b/foyer-storage/src/small/generic.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/mod.rs b/foyer-storage/src/small/mod.rs index 44c6f579..96921064 100644 --- a/foyer-storage/src/small/mod.rs +++ b/foyer-storage/src/small/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/serde.rs b/foyer-storage/src/small/serde.rs index 2648ad48..b704946a 100644 --- a/foyer-storage/src/small/serde.rs +++ b/foyer-storage/src/small/serde.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/set.rs b/foyer-storage/src/small/set.rs index 02e94adb..62234e21 100644 --- a/foyer-storage/src/small/set.rs +++ b/foyer-storage/src/small/set.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/small/set_manager.rs b/foyer-storage/src/small/set_manager.rs index 441f0253..98dd3c22 100644 --- a/foyer-storage/src/small/set_manager.rs +++ b/foyer-storage/src/small/set_manager.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/statistics.rs b/foyer-storage/src/statistics.rs index 5fcc285d..bac5f618 100644 --- a/foyer-storage/src/statistics.rs +++ b/foyer-storage/src/statistics.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/storage/either.rs b/foyer-storage/src/storage/either.rs index 30788549..60f1b1db 100644 --- a/foyer-storage/src/storage/either.rs +++ b/foyer-storage/src/storage/either.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/storage/mod.rs b/foyer-storage/src/storage/mod.rs index b82e08da..c9861e5e 100644 --- a/foyer-storage/src/storage/mod.rs +++ b/foyer-storage/src/storage/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/storage/noop.rs b/foyer-storage/src/storage/noop.rs index b8daf6b5..2930d165 100644 --- a/foyer-storage/src/storage/noop.rs +++ b/foyer-storage/src/storage/noop.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/src/store.rs b/foyer-storage/src/store.rs index b4d5ae16..adea7039 100644 --- a/foyer-storage/src/store.rs +++ b/foyer-storage/src/store.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -393,7 +393,7 @@ where /// Set the name of the foyer disk cache instance. /// - /// Foyer will use the name as the prefix of the metric names. + /// foyer will use the name as the prefix of the metric names. /// /// Default: `foyer`. pub fn with_name(mut self, name: &str) -> Self { diff --git a/foyer-storage/src/test_utils.rs b/foyer-storage/src/test_utils.rs index 317a85e7..cfef7dbc 100644 --- a/foyer-storage/src/test_utils.rs +++ b/foyer-storage/src/test_utils.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-storage/tests/storage_test.rs b/foyer-storage/tests/storage_test.rs index e57bbf9c..e20b75ef 100644 --- a/foyer-storage/tests/storage_test.rs +++ b/foyer-storage/tests/storage_test.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/Cargo.toml b/foyer-util/Cargo.toml index 05374840..ab381677 100644 --- a/foyer-util/Cargo.toml +++ b/foyer-util/Cargo.toml @@ -1,13 +1,15 @@ [package] name = "foyer-utils" -version = "0.0.0" -edition = "2021" -authors = ["MrCroxx "] -description = "utils for foyer - the hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" +description = "utils for foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } publish = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -16,7 +18,7 @@ bitmaps = "3" bitvec = "1" bytes = "1" cfg-if = "1" -foyer-common = { path = "../foyer-common" } +foyer-common = { workspace = true } futures = "0.3" hashbrown = "0.14" itertools = { workspace = true } diff --git a/foyer-util/src/async_batch_pipeline.rs b/foyer-util/src/async_batch_pipeline.rs index dd15875d..6278f919 100644 --- a/foyer-util/src/async_batch_pipeline.rs +++ b/foyer-util/src/async_batch_pipeline.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/batch.rs b/foyer-util/src/batch.rs index a9a72ea6..016e3591 100644 --- a/foyer-util/src/batch.rs +++ b/foyer-util/src/batch.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/compact_bloom_filter.rs b/foyer-util/src/compact_bloom_filter.rs index 103244f5..9c7505d2 100644 --- a/foyer-util/src/compact_bloom_filter.rs +++ b/foyer-util/src/compact_bloom_filter.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/continuum.rs b/foyer-util/src/continuum.rs index 4efac1d4..1ee8a089 100644 --- a/foyer-util/src/continuum.rs +++ b/foyer-util/src/continuum.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/erwlock.rs b/foyer-util/src/erwlock.rs index 9bd48f6f..1c95264e 100644 --- a/foyer-util/src/erwlock.rs +++ b/foyer-util/src/erwlock.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/iostat.rs b/foyer-util/src/iostat.rs index cc88e8e1..7a02e12d 100644 --- a/foyer-util/src/iostat.rs +++ b/foyer-util/src/iostat.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/judge.rs b/foyer-util/src/judge.rs index dad658fd..d654429c 100644 --- a/foyer-util/src/judge.rs +++ b/foyer-util/src/judge.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/lib.rs b/foyer-util/src/lib.rs index 05d4f02d..7136494c 100644 --- a/foyer-util/src/lib.rs +++ b/foyer-util/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/slab/mod.rs b/foyer-util/src/slab/mod.rs index efb72834..c1b889ab 100644 --- a/foyer-util/src/slab/mod.rs +++ b/foyer-util/src/slab/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/slab/slab_linked_list/mod.rs b/foyer-util/src/slab/slab_linked_list/mod.rs index 99c8c390..5f7dc928 100644 --- a/foyer-util/src/slab/slab_linked_list/mod.rs +++ b/foyer-util/src/slab/slab_linked_list/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/slab/slab_linked_list/tests.rs b/foyer-util/src/slab/slab_linked_list/tests.rs index 037be82e..0189d777 100644 --- a/foyer-util/src/slab/slab_linked_list/tests.rs +++ b/foyer-util/src/slab/slab_linked_list/tests.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer-util/src/slab/tests.rs b/foyer-util/src/slab/tests.rs index dd12ba1d..75a0abbe 100644 --- a/foyer-util/src/slab/tests.rs +++ b/foyer-util/src/slab/tests.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer/Cargo.toml b/foyer/Cargo.toml index 33a2d4f0..c9eb989b 100644 --- a/foyer/Cargo.toml +++ b/foyer/Cargo.toml @@ -1,23 +1,24 @@ [package] name = "foyer" -version = "0.11.5" -edition = "2021" -authors = ["MrCroxx "] -description = "Hybrid cache for Rust" -license = "Apache-2.0" -repository = "https://github.com/foyer-rs/foyer" -homepage = "https://github.com/foyer-rs/foyer" -readme = "../README.md" -rust-version = "1.81.0" +description = "foyer - Hybrid cache for Rust" +version = { workspace = true } +edition = { workspace = true } +rust-version = { workspace = true } +repository = { workspace = true } +homepage = { workspace = true } +keywords = { workspace = true } +authors = { workspace = true } +license = { workspace = true } +readme = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] ahash = "0.8" anyhow = "1" fastrace = { workspace = true } -foyer-common = { version = "0.9.5", path = "../foyer-common" } -foyer-memory = { version = "0.7.5", path = "../foyer-memory" } -foyer-storage = { version = "0.10.5", path = "../foyer-storage" } +foyer-common = { workspace = true } +foyer-memory = { workspace = true } +foyer-storage = { workspace = true } futures = "0.3" pin-project = "1" tokio = { workspace = true } diff --git a/foyer/src/hybrid/builder.rs b/foyer/src/hybrid/builder.rs index ab01c3c1..892cf0b8 100644 --- a/foyer/src/hybrid/builder.rs +++ b/foyer/src/hybrid/builder.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ impl HybridCacheBuilder { /// Set the name of the foyer hybrid cache instance. /// - /// Foyer will use the name as the prefix of the metric names. + /// foyer will use the name as the prefix of the metric names. /// /// Default: `foyer`. pub fn with_name(mut self, name: &str) -> Self { diff --git a/foyer/src/hybrid/cache.rs b/foyer/src/hybrid/cache.rs index 8e726832..49948fc2 100644 --- a/foyer/src/hybrid/cache.rs +++ b/foyer/src/hybrid/cache.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer/src/hybrid/mod.rs b/foyer/src/hybrid/mod.rs index dcd12ead..08d4ed07 100644 --- a/foyer/src/hybrid/mod.rs +++ b/foyer/src/hybrid/mod.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer/src/hybrid/writer.rs b/foyer/src/hybrid/writer.rs index 3d040594..5d4e72ae 100644 --- a/foyer/src/hybrid/writer.rs +++ b/foyer/src/hybrid/writer.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer/src/lib.rs b/foyer/src/lib.rs index 2a636cd5..d116d7e1 100644 --- a/foyer/src/lib.rs +++ b/foyer/src/lib.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/foyer/src/prelude.rs b/foyer/src/prelude.rs index a9c426fa..4746626e 100644 --- a/foyer/src/prelude.rs +++ b/foyer/src/prelude.rs @@ -1,4 +1,4 @@ -// Copyright 2024 Foyer Project Authors +// Copyright 2024 foyer Project Authors // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.