Skip to content

Commit

Permalink
Update cargo vet, cargo fmt and cargo.lock to fix CI (#220)
Browse files Browse the repository at this point in the history
### Checklist

* [x] I have read the [Contributor Guide](../CONTRIBUTING.md)
* [x] I have read and agree to the [Code of
Conduct](../CODE_OF_CONDUCT.md)
* [x] I have added a description of my changes and why I'd like them
included in the section below
  • Loading branch information
Hoodad authored Jun 26, 2024
1 parent 5b1e3bb commit 5494ef0
Show file tree
Hide file tree
Showing 5 changed files with 161 additions and 75 deletions.
8 changes: 8 additions & 0 deletions Cargo.lock

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

9 changes: 4 additions & 5 deletions puffin/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,20 +231,19 @@ macro_rules! profile_function {
};
}


/// Profile the current scope with the given name (unique in the parent scope).
///
///
/// This macro is identical to [profile_scope], except that it expands to the expression
/// containing the profiling scope, as opposed to [profile_scope] which expands to a
/// variable (which cannot be accessed due to macro hygiene).
///
/// This allows for profiling scopes to persist for a custom duration.
///
///
/// # Example
///
///
/// ```rust
/// # use std::iter::FromIterator as _;
/// #
/// #
/// # pub mod rayon { pub mod prelude {
/// # pub fn for_each_init<T, I>(vec: &std::vec::Vec<T>, init: fn() -> I, body: fn ((I, T)) -> ()) {
/// # }
Expand Down
12 changes: 6 additions & 6 deletions puffin_http/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ impl Server {
/// // Remove
/// |id| _ = get_custom_profiler().remove_sink(id)
/// );
///
///
/// // Create some custom threads where we use the custom profiler and server
/// std::thread::scope(|scope| {
/// scope.spawn(move ||{
Expand Down Expand Up @@ -124,7 +124,7 @@ impl Server {
/// ```rust
/// # use std::thread::sleep;
/// # use std::time::Duration;
///
///
/// /// This macro makes it much easier to define profilers
/// ///
/// /// This macro makes use of the `paste` crate to generate unique identifiers, and `tracing` to log events
Expand All @@ -137,7 +137,7 @@ impl Server {
/// profiler!(@inner { name: $name, port: $port $(,install: |$install_var| $install, drop: |$drop_var| $drop)? });
/// )*
/// };
///
///
/// (@inner { name: $name:ident, port: $port:expr }) => {
/// paste::paste!{
/// #[doc = concat!("The address to bind the ", std::stringify!([< $name:lower >]), " thread profilers' server to")]
Expand Down Expand Up @@ -203,7 +203,7 @@ impl Server {
/// { name: RENDERER, port: 8586 },
/// { name: BACKGROUND, port: 8587 },
/// }
///
///
/// pub fn demo() {
/// std::thread::spawn(|| {
/// // Initialise the custom profiler for this thread
Expand All @@ -223,8 +223,8 @@ impl Server {
/// ```
pub fn new_custom(
bind_addr: &str,
sink_install: fn (puffin::FrameSink) -> puffin::FrameSinkId,
sink_remove: fn (puffin::FrameSinkId) -> (),
sink_install: fn(puffin::FrameSink) -> puffin::FrameSinkId,
sink_remove: fn(puffin::FrameSinkId) -> (),
) -> anyhow::Result<Self> {
let tcp_listener = TcpListener::bind(bind_addr).context("binding server TCP socket")?;
tcp_listener
Expand Down
48 changes: 4 additions & 44 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ url = "https://raw.githubusercontent.com/bytecodealliance/wasmtime/main/supply-c
[imports.zcash]
url = "https://raw.githubusercontent.com/zcash/rust-ecosystem/main/supply-chain/audits.toml"

[policy.errno-dragonfly]
criteria = []
notes = "Not used, unsupported target"

[policy.orbclient]
criteria = []
notes = "Not used, Redox OS-only"
Expand Down Expand Up @@ -143,10 +139,6 @@ criteria = "safe-to-deploy"
version = "0.2.0"
criteria = "safe-to-deploy"

[[exemptions.cast]]
version = "0.3.0"
criteria = "safe-to-run"

[[exemptions.cesu8]]
version = "1.1.0"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -191,14 +183,6 @@ criteria = "safe-to-deploy"
version = "2.4.0"
criteria = "safe-to-deploy"

[[exemptions.core-foundation]]
version = "0.9.4"
criteria = "safe-to-deploy"

[[exemptions.core-graphics-types]]
version = "0.1.3"
criteria = "safe-to-deploy"

[[exemptions.crc32fast]]
version = "1.3.2"
criteria = "safe-to-deploy"
Expand All @@ -211,14 +195,6 @@ criteria = "safe-to-run"
version = "0.5.0"
criteria = "safe-to-run"

[[exemptions.crossbeam-deque]]
version = "0.8.5"
criteria = "safe-to-run"

[[exemptions.crossbeam-epoch]]
version = "0.9.18"
criteria = "safe-to-run"

[[exemptions.crossbeam-utils]]
version = "0.8.8"
criteria = "safe-to-deploy"
Expand All @@ -239,10 +215,6 @@ criteria = "safe-to-deploy"
version = "0.5.2"
criteria = "safe-to-deploy"

[[exemptions.downcast-rs]]
version = "1.2.0"
criteria = "safe-to-deploy"

[[exemptions.env_logger]]
version = "0.10.1"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -363,14 +335,6 @@ criteria = "safe-to-deploy"
version = "0.11.2"
criteria = "safe-to-deploy"

[[exemptions.memmap2]]
version = "0.5.4"
criteria = "safe-to-deploy"

[[exemptions.memoffset]]
version = "0.6.5"
criteria = "safe-to-deploy"

[[exemptions.memoffset]]
version = "0.9.1"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -427,6 +391,10 @@ criteria = "safe-to-deploy"
version = "0.15.10"
criteria = "safe-to-deploy"

[[exemptions.paste]]
version = "1.0.15"
criteria = "safe-to-run"

[[exemptions.pkg-config]]
version = "0.3.28"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -455,10 +423,6 @@ criteria = "safe-to-deploy"
version = "3.0.0"
criteria = "safe-to-deploy"

[[exemptions.quick-xml]]
version = "0.30.0"
criteria = "safe-to-deploy"

[[exemptions.regex-syntax]]
version = "0.7.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -535,10 +499,6 @@ criteria = "safe-to-deploy"
version = "0.2.9"
criteria = "safe-to-deploy"

[[exemptions.tinytemplate]]
version = "1.2.1"
criteria = "safe-to-run"

[[exemptions.toml]]
version = "0.8.8"
criteria = "safe-to-deploy"
Expand Down
Loading

0 comments on commit 5494ef0

Please sign in to comment.