Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into bruceg/object-from-array
Browse files Browse the repository at this point in the history
  • Loading branch information
bruceg committed Dec 4, 2024
2 parents d61e3b6 + fb118ee commit b4c7f4a
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ updates:
- package-ecosystem: "cargo"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
time: "04:00" # UTC
labels:
- "domain: deps"
Expand All @@ -25,7 +25,7 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
labels:
- "domain: ci"
- "no-changelog"
Expand Down
114 changes: 60 additions & 54 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ domain = { version = "0.10.3", optional = true, features = ["resolv-sync", "serd
hostname = { version = "0.4", optional = true }
grok = { version = "2", optional = true }
onig = { version = "6", default-features = false, optional = true }
tokio = { version = "1.38", optional = true, features = ["io-util", "macros", "net", "time", "sync", "rt", "rt-multi-thread"] }
tokio = { version = "1.42", optional = true, features = ["io-util", "macros", "net", "time", "sync", "rt", "rt-multi-thread"] }
uuid = { version = "1", features = ["v4", "v7"], optional = true }

# Dependencies used for WASM
Expand Down
3 changes: 1 addition & 2 deletions LICENSE-3rdparty.csv
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ hashbrown,https://github.com/rust-lang/hashbrown,MIT OR Apache-2.0,Amanieu d'Ant
heck,https://github.com/withoutboats/heck,MIT OR Apache-2.0,The heck Authors
heck,https://github.com/withoutboats/heck,MIT OR Apache-2.0,Without Boats <[email protected]>
hermit-abi,https://github.com/hermitcore/hermit-rs,MIT OR Apache-2.0,Stefan Lankes
hermit-abi,https://github.com/hermitcore/rusty-hermit,MIT OR Apache-2.0,Stefan Lankes
hex,https://github.com/KokaKiwi/rust-hex,MIT OR Apache-2.0,KokaKiwi <[email protected]>
hmac,https://github.com/RustCrypto/MACs,MIT OR Apache-2.0,RustCrypto Developers
home,https://github.com/rust-lang/cargo,MIT OR Apache-2.0,Brian Anderson <[email protected]>
Expand All @@ -130,6 +129,7 @@ influxdb-line-protocol,https://github.com/influxdata/influxdb_iox/tree/main/infl
inout,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
io-lifetimes,https://github.com/sunfishcode/io-lifetimes,Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT,Dan Gohman <[email protected]>
is-terminal,https://github.com/sunfishcode/is-terminal,MIT,"softprops <[email protected]>, Dan Gohman <[email protected]>"
is_terminal_polyfill,https://github.com/polyfill-rs/is_terminal_polyfill,MIT OR Apache-2.0,The is_terminal_polyfill Authors
itertools,https://github.com/rust-itertools/itertools,MIT OR Apache-2.0,bluss
itoa,https://github.com/dtolnay/itoa,MIT OR Apache-2.0,David Tolnay <[email protected]>
jni,https://github.com/jni-rs/jni-rs,MIT OR Apache-2.0,Josh Chase <[email protected]>
Expand Down Expand Up @@ -157,7 +157,6 @@ num-bigint,https://github.com/rust-num/num-bigint,MIT OR Apache-2.0,The Rust Pro
num-conv,https://github.com/jhpratt/num-conv,MIT OR Apache-2.0,Jacob Pratt <[email protected]>
num-integer,https://github.com/rust-num/num-integer,MIT OR Apache-2.0,The Rust Project Developers
num-traits,https://github.com/rust-num/num-traits,MIT OR Apache-2.0,The Rust Project Developers
num_cpus,https://github.com/seanmonstar/num_cpus,MIT OR Apache-2.0,Sean McArthur <[email protected]>
num_enum,https://github.com/illicitonion/num_enum,BSD-3-Clause OR MIT OR Apache-2.0,"Daniel Wagner-Hall <[email protected]>, Daniel Henry-Mantilla <[email protected]>, Vincent Esche <[email protected]>"
objc-sys,https://github.com/madsmtm/objc2,MIT,Mads Marquart <[email protected]>
objc2,https://github.com/madsmtm/objc2,MIT,"Steven Sheldon, Mads Marquart <[email protected]>"
Expand Down
Loading

0 comments on commit b4c7f4a

Please sign in to comment.