Skip to content

Commit 1ca85a9

Browse files
author
Guillaume Bouvignies
committed
Bump prometheus
1 parent ae5d266 commit 1ca85a9

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- uses: actions/checkout@v3
25-
- run: rustup update && rustup override set 1.67.0 && rustup component add clippy
25+
- run: rustup update && rustup override set 1.81.0 && rustup component add clippy
2626
- uses: Swatinem/rust-cache@v2
2727
- run: cargo clippy --all-targets -- -D warnings -D clippy::all
2828

Cargo.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version = "0.2.1"
1616
[dependencies]
1717
libz-sys = { version = "1.1.8", default-features = false, features = ["libc"] }
1818
lz4-sys = "1.9.4"
19-
prometheus = "0.13.3"
19+
prometheus = "0.14"
2020
serde = { version = "1.0.157", features = ["derive"] }
2121
tracing = { version = "0.1.37", features = ["log"] }
2222
zstd-sys = "2.0.7"
@@ -35,3 +35,6 @@ cc = "1.0.79"
3535

3636
[profile.dev]
3737
incremental = false
38+
39+
[package.metadata.typos]
40+
default.extend-ignore-re = [ "(?Rm)^.*(#|//)\\s*spellchecker:disable-line$" ]

deny.toml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
[licenses]
2-
unlicensed = "deny"
32
allow = [
43
"MIT",
54
"Apache-2.0",
6-
"Unicode-DFS-2016"
5+
"Unicode-3.0",
6+
"ISC",
7+
"BSD-3-Clause"
78
]
8-
default = "deny"
99

1010
[bans]
1111
multiple-versions = "warn"
1212
wildcards = "deny"
13-
14-
[advisories]
15-
ignore = [
16-
"RUSTSEC-2020-0071", # time crate segfault. We only use it in tests.
17-
]

src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ impl DbConf {
6363
/// 2. The name of the database file.
6464
/// 3. The mode it will work on (single- or multi-threaded).
6565
/// 4. Whether the database is to be used in read-only mode, or writes
66-
/// are also allowed.
66+
/// are also allowed.
6767
/// 5. The upper-layer set of (Prometheus) metrics to be updated by
68-
/// the database.
68+
/// the database.
6969
/// 6. Whether compression is to be used or not, and what kind.
7070
///
7171
/// # Example

src/lsmdb.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ extern "C" {
9191
fn lsm_csr_next(cursor: *mut lsm_cursor) -> i32;
9292
fn lsm_csr_prev(cursor: *mut lsm_cursor) -> i32;
9393
fn lsm_csr_valid(cursor: *mut lsm_cursor) -> i32;
94-
fn lsm_csr_key(cursor: *mut lsm_cursor, pp_key: *const *mut u8, pn_key: *mut i32) -> i32;
95-
fn lsm_csr_value(cursor: *mut lsm_cursor, pp_val: *const *mut u8, pn_val: *mut i32) -> i32;
94+
fn lsm_csr_key(cursor: *mut lsm_cursor, pp_key: *const *mut u8, pn_key: *mut i32) -> i32; // # spellchecker:disable-line
95+
fn lsm_csr_value(cursor: *mut lsm_cursor, pp_val: *const *mut u8, pn_val: *mut i32) -> i32; // # spellchecker:disable-line
9696
fn lsm_csr_cmp(cursor: *mut lsm_cursor, p_key: *const u8, n_key: i32, pi_res: *mut i32) -> i32;
9797
#[allow(dead_code)]
9898
fn lsm_free(env: *mut lsm_env, ptr: *mut c_char);
@@ -401,8 +401,8 @@ impl Disk for LsmDb {
401401
/// to `connect` has to have the corresponding call to `disconnect`, otherwise:
402402
/// 1. The resources that belong to the memory handle will be leaked.
403403
/// 2. The database (file) won't be closed and the next time we open it the recovery
404-
/// process will kick-in (which can take considerable time. Depending on the
405-
/// size of the log).
404+
/// process will kick-in (which can take considerable time. Depending on the
405+
/// size of the log).
406406
///
407407
/// For completeness, [`LsmDb`] also implements [`Drop`] so that a handle
408408
/// gets automatically released once it goes out of scope.
@@ -969,15 +969,15 @@ impl Cursor for LsmCursor<'_> {
969969
/// This positions the cursor on an entry of the database that depends on
970970
/// the seek mode provided:
971971
/// 1. If [`LsmCursorSeekOp::LsmCursorSeekLe`] is given, then the cursor will be positioned
972-
/// at the entry that is less or equal than the provided key depending on whether
973-
/// the key is found in the database or not.
972+
/// at the entry that is less or equal than the provided key depending on whether
973+
/// the key is found in the database or not.
974974
/// 2. If [`LsmCursorSeekOp::LsmCursorSeekEq`] is given, then the cursor will be positioned
975-
/// at the entry that corresponding to the given key, or at the end of the database
976-
/// depending on whether the entry is found or not. If the entry is found, a call
977-
/// to `valid` on the cursor will return success, and otherwise an error.
975+
/// at the entry that corresponding to the given key, or at the end of the database
976+
/// depending on whether the entry is found or not. If the entry is found, a call
977+
/// to `valid` on the cursor will return success, and otherwise an error.
978978
/// 3. If [`LsmCursorSeekOp::LsmCursorSeekGe`] is given, then the cursor will be positioned
979-
/// at the entry that is greater or equal than the provided key depending on
980-
/// whether the key is found in the database or not.
979+
/// at the entry that is greater or equal than the provided key depending on
980+
/// whether the key is found in the database or not.
981981
fn seek(&mut self, key: &[u8], mode: LsmCursorSeekOp) -> Result<(), LsmErrorCode> {
982982
if self.db_cursor.is_null() {
983983
return Err(LsmErrorCode::LsmMisuse);

0 commit comments

Comments
 (0)