From 63b853cdb492ca0f682b922eb75f43363d9cd48d Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:10:08 +0100
Subject: [PATCH 01/12] Fixup README

---
 README.md | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index e61e65e2..121a35a8 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,12 @@
 <div align="center">
-  <h1><code>🐦 puffin</code></h1>
 
-   <p>
-    <strong>The friendly little instrumentation profiler for Rust</strong>
-  </p>
+# `🐦 puffin`
 
-  ![Puffin photo by Richard Bartz](puffin.jpg)
+**The friendly little instrumentation profiler for Rust**
 
-  [(puffin photo by Richard Bartz)](https://en.wikipedia.org/wiki/File:Papageitaucher_Fratercula_arctica.jpg)
+![Puffin photo by Richard Bartz](puffin.jpg)
 
-  <p>
+[(puffin photo by Richard Bartz)](https://en.wikipedia.org/wiki/File:Papageitaucher_Fratercula_arctica.jpg)
 
 [![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev)
 [![Embark](https://img.shields.io/badge/discord-ark-%237289da.svg?logo=discord)](https://discord.gg/dAuKfZS)
@@ -18,7 +15,6 @@
 [![dependency status](https://deps.rs/repo/github/EmbarkStudios/puffin/status.svg)](https://deps.rs/repo/github/EmbarkStudios/puffin)
 [![Build Status](https://github.com/EmbarkStudios/puffin/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/puffin/actions?workflow=CI)
 
-  </p>
 </div>
 
 ## How to use
@@ -58,7 +54,7 @@ Also check out the crate [`profiling`](https://crates.io/crates/profiling) which
 
 ## Contributing
 
-[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](../CODE_OF_CONDUCT.md)
+[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](CODE_OF_CONDUCT.md)
 
 We welcome community contributions to this project.
 
@@ -68,8 +64,8 @@ Please read our [Contributor Guide](CONTRIBUTING.md) for more information on how
 
 Licensed under either of
 
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
 
 at your option.
 

From 784d379673e70b664879594ecdd76053d3a9677c Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:20:27 +0100
Subject: [PATCH 02/12] Fixup CHANGELOG, add release.toml

---
 CHANGELOG.md | 79 ++++++++++++++++++++++++++++++++++------------------
 release.toml | 10 +++++++
 2 files changed, 62 insertions(+), 27 deletions(-)
 create mode 100644 release.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9c128b4..9fc4aa72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+<!-- markdownlint-disable blanks-around-headings blanks-around-lists no-duplicate-heading -->
 # Changelog
 
 All notable changes to `puffin` will be documented in this file.
@@ -5,64 +6,88 @@ All notable changes to `puffin` will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-
-## Unreleased
+<!-- next-header -->
+## [Unreleased] - ReleaseDate
+### Fixed
 * Fix compilation for `wasm32-unknown-unknown`.
+
+### Changed
 * Upgrade `ztd` v0.9 -> v0.10
 
-## 0.12.1 - 2021-11-16
+## [0.12.1] - 2021-11-16
+### Fixed
 * Make `parking_lot` an optional dependency.
 
-
-## 0.12.0 - 2021-11-16
+## [0.12.0] - 2021-11-16
+### Fixed
 * In-memory compression of frames to use up less RAM. Enabled by the new feature "packing".
-* Remove support for legacy `.puffin` files in order to remove `lz4_flex` dependency.
 
+### Changed
+* Remove support for legacy `.puffin` files in order to remove `lz4_flex` dependency.
 
-## 0.11.0 - 2021-11-12
+## [0.11.0] - 2021-11-12
+### Changed
 * Introduce `StreamInfoRef` to avoid memory allocations.
 * Remove deprecated macros `profile_function_data` and `profile_scope_data`.
 
-
-## 0.10.1 - 2021-11-02
+## [0.10.1] - 2021-11-02
+### Fixed
 * `now_ns` now returns nanoseconds since unix epoch.
 * Make scope merging deterministic.
 
-
-## 0.10.0 - 2021-10-12
+## [0.10.0] - 2021-10-12
+### Changed
 * Rewrite scope merging.
 * Implement `Hash` on `ThreadInfo`.
 
-
-## 0.9.0 - 2021-09-20
+## [0.9.0] - 2021-09-20
+### Changed
 * API change: split out new `FrameView` and `GlobalFrameView` from `GlobalProfiler`.
 
-
-## 0.8.1 - 2021-09-07
+## [0.8.1] - 2021-09-07
+### Fixed
 * Remove profile scopes in serialization to avoid deadlock in `puffin_viewer`.
 
-
-## 0.8.0 - 2021-09-06
+## [0.8.0] - 2021-09-06
+### Changed
 * Switch from lz4 to zstd compression for 50% file size and bandwidth reduction.
 
-
-## 0.7.0 - 2021-08-23
+## [0.7.0] - 2021-08-23
+### Changed
 * Speed up `GlobalProfiler::new_frame`.
 * New `serialization` feature flag enables exporting and importing `.puffin` files. This replaces the old `with_serde` feature flag.
-* Add `GlobalProfiler::add_sink` for installing callbacks that are called each frame.
 
+### Added
+* Add `GlobalProfiler::add_sink` for installing callbacks that are called each frame.
 
-## 0.6.0 - 2021-07-05
+## [0.6.0] - 2021-07-05
+### Fixed
 * Handle Windows, which uses backslash (`\`) as path separator.
 
-
-## 0.5.2
+## [0.5.2] - 2021-14-27
+### Changed
 * Add opt-in `serde` support.
 
-
-## 0.5.1
+## [0.5.1] - 2021-05-27
+### Fixed
 * Remove stderr warning about empty frames.
 
-
-## 0.5.0
+## [0.5.0] - 2021-05-27
+### Changed
 * `GlobalProfiler` now store recent history and the slowest frames.
+
+<!-- next-url -->
+[Unreleased]: https://github.com/EmbarkStudios/krates/compare/0.12.1...HEAD
+[0.12.1]: https://github.com/EmbarkStudios/krates/compare/0.12.0...0.12.1
+[0.12.0]: https://github.com/EmbarkStudios/krates/compare/0.11.0...0.12.0
+[0.11.0]: https://github.com/EmbarkStudios/krates/compare/0.10.1...0.11.0
+[0.10.1]: https://github.com/EmbarkStudios/krates/compare/0.10.0...0.10.1
+[0.10.0]: https://github.com/EmbarkStudios/krates/compare/0.9.0...0.10.0
+[0.9.0]: https://github.com/EmbarkStudios/krates/compare/0.8.1...0.9.0
+[0.8.1]: https://github.com/EmbarkStudios/krates/compare/0.8.0...0.8.1
+[0.8.0]: https://github.com/EmbarkStudios/krates/compare/0.7.0...0.8.0
+[0.7.0]: https://github.com/EmbarkStudios/krates/compare/0.6.0...0.7.0
+[0.6.0]: https://github.com/EmbarkStudios/krates/compare/0.5.1...0.6.0
+[0.5.2]: https://github.com/EmbarkStudios/krates/compare/0.5.1...0.5.2
+[0.5.1]: https://github.com/EmbarkStudios/krates/compare/0.5.0...0.5.1
+[0.5.0]: https://github.com/EmbarkStudios/krates/releases/tag/0.5.0
diff --git a/release.toml b/release.toml
new file mode 100644
index 00000000..91b2bd3f
--- /dev/null
+++ b/release.toml
@@ -0,0 +1,10 @@
+pre-release-commit-message = "Release {{version}}"
+tag-message = "Release {{version}}"
+tag-name = "{{version}}"
+pre-release-replacements = [
+    { file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
+    { file = "CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}" },
+    { file = "CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}" },
+    { file = "CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate" },
+    { file = "CHANGELOG.md", search = "<!-- next-url -->", replace = "<!-- next-url -->\n[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/{{tag_name}}...HEAD" },
+]

From 2dbe6b38d93b1068ed6f51e9283228cecd81b28a Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:30:57 +0100
Subject: [PATCH 03/12] Update dependencies

---
 Cargo.lock               | 1243 ++++++++++++++++++++++++--------------
 puffin-imgui/Cargo.toml  |    2 +-
 puffin/Cargo.toml        |   12 +-
 puffin_http/Cargo.toml   |    9 +-
 puffin_viewer/Cargo.toml |   16 +-
 5 files changed, 800 insertions(+), 482 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 566fdabb..e658060c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61caed9aec6daeee1ea38ccf5fb225e4f96c1eeead1b4a5c267324a63cf02326"
 dependencies = [
  "ab_glyph_rasterizer",
- "owned_ttf_parser 0.14.0",
+ "owned_ttf_parser",
 ]
 
 [[package]]
@@ -46,16 +46,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "andrew"
-version = "0.3.1"
+name = "aho-corasick"
+version = "0.7.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf"
+checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
 dependencies = [
- "bitflags",
- "rusttype",
- "walkdir",
- "xdg",
- "xml-rs",
+ "memchr",
 ]
 
 [[package]]
@@ -66,9 +62,9 @@ checksum = "000444226fcff248f2bc4c7625be32c63caccfecc2723a2b9f78a7487a49c407"
 
 [[package]]
 name = "anyhow"
-version = "1.0.52"
+version = "1.0.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84450d0b4a8bd1ba4144ce8ce718fbc5d071358b1e5384bace6536b3d1f2d5b3"
+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
 
 [[package]]
 name = "argh"
@@ -87,7 +83,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be69f70ef5497dd6ab331a50bd95c6ac6b8f7f17a7967838332743fbd58dc3b5"
 dependencies = [
  "argh_shared",
- "heck",
+ "heck 0.3.3",
  "proc-macro2",
  "quote",
  "syn",
@@ -99,11 +95,117 @@ version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6f8c380fa28aa1b36107cd97f0196474bb7241bb95a453c5c01a15ac74b2eac"
 
+[[package]]
+name = "ashpd"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7915e26e0786f91768d23de32afafa4ee5e2ea76be21c0ecd8e14441543c1655"
+dependencies = [
+ "enumflags2",
+ "futures",
+ "rand",
+ "serde",
+ "serde_repr",
+ "zbus",
+]
+
+[[package]]
+name = "async-broadcast"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90622698a1218e0b2fb846c97b5f19a0831f6baddee73d9454156365ccfa473b"
+dependencies = [
+ "easy-parallel",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "once_cell",
+ "slab",
+]
+
+[[package]]
+name = "async-io"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b"
+dependencies = [
+ "concurrent-queue",
+ "futures-lite",
+ "libc",
+ "log",
+ "once_cell",
+ "parking",
+ "polling",
+ "slab",
+ "socket2",
+ "waker-fn",
+ "winapi",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-recursion"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-task"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8"
+
+[[package]]
+name = "async-trait"
+version = "0.1.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atk-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "badcf670157c84bb8b1cf6b5f70b650fed78da2033c9eed84c4e49b11cbe83ea"
+checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -136,9 +238,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "backtrace"
-version = "0.3.63"
+version = "0.3.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6"
+checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f"
 dependencies = [
  "addr2line",
  "cc",
@@ -201,23 +303,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
 [[package]]
-name = "cairo-sys-rs"
-version = "0.14.9"
+name = "cache-padded"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
-dependencies = [
- "libc",
- "system-deps",
-]
+checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
 
 [[package]]
-name = "calloop"
-version = "0.6.5"
+name = "cairo-sys-rs"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
+checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
 dependencies = [
- "log",
- "nix 0.18.0",
+ "libc",
+ "system-deps",
 ]
 
 [[package]]
@@ -227,7 +325,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf2eec61efe56aa1e813f5126959296933cf0700030e4314786c48779a66ab82"
 dependencies = [
  "log",
- "nix 0.22.0",
+ "nix 0.22.3",
 ]
 
 [[package]]
@@ -250,9 +348,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-expr"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
+checksum = "3431df59f28accaf4cb4eed4a9acc66bea3f3c3753aa6cdc2f024174ef232af7"
 dependencies = [
  "smallvec",
 ]
@@ -351,15 +449,24 @@ dependencies = [
 
 [[package]]
 name = "colored"
-version = "1.9.3"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59"
+checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd"
 dependencies = [
  "atty",
  "lazy_static",
  "winapi",
 ]
 
+[[package]]
+name = "concurrent-queue"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3"
+dependencies = [
+ "cache-padded",
+]
+
 [[package]]
 name = "copypasta"
 version = "0.7.1"
@@ -492,20 +599,6 @@ dependencies = [
  "itertools",
 ]
 
-[[package]]
-name = "crossbeam"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-channel",
- "crossbeam-deque",
- "crossbeam-epoch",
- "crossbeam-queue",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.2"
@@ -529,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.6"
+version = "0.9.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97242a70df9b89a65d0b6df3c4bf5b9ce03c5b7309019777fbde37e7537f8762"
+checksum = "c00d6d2ea26e8b151d99093005cb442fb9a37aeaca582a03ec70946f49ab5ed9"
 dependencies = [
  "cfg-if 1.0.0",
  "crossbeam-utils",
@@ -540,21 +633,11 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "crossbeam-queue"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b979d76c9fcb84dffc80a73f7290da0f83e4c95773494674cb44b76d13a7a110"
-dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120"
+checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6"
 dependencies = [
  "cfg-if 1.0.0",
  "lazy_static",
@@ -659,33 +742,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "directories-next"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
-dependencies = [
- "cfg-if 1.0.0",
- "dirs-sys-next",
-]
-
-[[package]]
-name = "dirs"
-version = "3.0.2"
+name = "derivative"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
 dependencies = [
- "dirs-sys",
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
-name = "dirs-sys"
-version = "0.3.6"
+name = "directories-next"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+checksum = "339ee130d97a610ea5a5872d2bbb130fdf68884ff09d3028b81bec8a1ac23bbc"
 dependencies = [
- "libc",
- "redox_users",
- "winapi",
+ "cfg-if 1.0.0",
+ "dirs-sys-next",
 ]
 
 [[package]]
@@ -705,22 +779,13 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
-[[package]]
-name = "dlib"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
-dependencies = [
- "libloading 0.6.7",
-]
-
 [[package]]
 name = "dlib"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
 dependencies = [
- "libloading 0.7.2",
+ "libloading",
 ]
 
 [[package]]
@@ -729,6 +794,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
 
+[[package]]
+name = "easy-parallel"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
+
 [[package]]
 name = "eframe"
 version = "0.16.0"
@@ -779,7 +850,7 @@ dependencies = [
  "egui-winit",
  "epi",
  "glow",
- "glutin 0.28.0",
+ "glutin",
  "memoffset",
  "wasm-bindgen",
  "web-sys",
@@ -814,6 +885,27 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "enumflags2"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25c90b056b3f84111cf183cbeddef0d3a0bbe9a674f057e1a1533c315f24def"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144ec79496cbab6f84fa125dc67be9264aef22eb8a28da8454d9c33f15108da4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "epaint"
 version = "0.16.0"
@@ -840,6 +932,21 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "event-listener"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
+
+[[package]]
+name = "fastrand"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
+dependencies = [
+ "instant",
+]
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -861,11 +968,115 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "futures"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+
+[[package]]
+name = "futures-lite"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+
+[[package]]
+name = "futures-task"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+
+[[package]]
+name = "futures-util"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "gdk-pixbuf-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f097c0704201fbc8f69c1762dc58c6947c8bb188b8ed0bc7e65259f1894fe590"
+checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
 dependencies = [
  "gio-sys",
  "glib-sys",
@@ -876,9 +1087,9 @@ dependencies = [
 
 [[package]]
 name = "gdk-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e091b3d3d6696949ac3b3fb3c62090e5bfd7bd6850bef5c3c5ea701de1b1f1e"
+checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88"
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -893,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -910,9 +1121,9 @@ checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
 
 [[package]]
 name = "gio-sys"
-version = "0.14.0"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0a41df66e57fcc287c4bcf74fc26b884f31901ea9792ec75607289b456f48fa"
+checksum = "4f0bc4cfc9ebcdd05cc5057bc51b99c32f8f9bf246274f6a556ffd27279f8fe3"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -934,9 +1145,9 @@ dependencies = [
 
 [[package]]
 name = "glib-sys"
-version = "0.14.0"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
+checksum = "fa1d4e1a63d8574541e5b92931e4e669ddc87ffa85d58e84e631dba13ad2e10c"
 dependencies = [
  "libc",
  "system-deps",
@@ -951,7 +1162,22 @@ dependencies = [
  "backtrace",
  "fnv",
  "gl_generator",
- "glutin 0.27.0",
+ "lazy_static",
+ "memoffset",
+ "smallvec",
+ "takeable-option",
+]
+
+[[package]]
+name = "glium"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19"
+dependencies = [
+ "backtrace",
+ "fnv",
+ "gl_generator",
+ "glutin",
  "lazy_static",
  "memoffset",
  "smallvec",
@@ -970,33 +1196,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "glutin"
-version = "0.27.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "762d6cd2e1b855d99668ebe591cc9058659d85ac39a9a2078000eb122ddba8f0"
-dependencies = [
- "android_glue",
- "cgl",
- "cocoa",
- "core-foundation 0.9.2",
- "glutin_egl_sys",
- "glutin_emscripten_sys",
- "glutin_gles2_sys",
- "glutin_glx_sys",
- "glutin_wgl_sys",
- "lazy_static",
- "libloading 0.7.2",
- "log",
- "objc",
- "osmesa-sys",
- "parking_lot",
- "wayland-client 0.28.6",
- "wayland-egl 0.28.6",
- "winapi",
- "winit 0.25.0",
-]
-
 [[package]]
 name = "glutin"
 version = "0.28.0"
@@ -1013,13 +1212,13 @@ dependencies = [
  "glutin_glx_sys",
  "glutin_wgl_sys",
  "lazy_static",
- "libloading 0.7.2",
+ "libloading",
  "log",
  "objc",
  "osmesa-sys",
- "parking_lot",
- "wayland-client 0.29.4",
- "wayland-egl 0.29.4",
+ "parking_lot 0.11.2",
+ "wayland-client",
+ "wayland-egl",
  "winapi",
  "winit 0.26.1",
 ]
@@ -1071,9 +1270,9 @@ dependencies = [
 
 [[package]]
 name = "gobject-sys"
-version = "0.14.0"
+version = "0.15.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
+checksum = "df6859463843c20cf3837e3a9069b6ab2051aeeadf4c899d33344f4aea83189a"
 dependencies = [
  "glib-sys",
  "libc",
@@ -1082,9 +1281,9 @@ dependencies = [
 
 [[package]]
 name = "gtk-sys"
-version = "0.14.0"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c14c8d3da0545785a7c5a120345b3abb534010fb8ae0f2ef3f47c027fba303e"
+checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84"
 dependencies = [
  "atk-sys",
  "cairo-sys-rs",
@@ -1114,14 +1313,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.1.19"
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
 dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -1136,7 +1347,7 @@ checksum = "e6a33933d4645d6db1bfa55ff75e13ef301644d4c001cfaec6fe3afcfb05b82c"
 dependencies = [
  "bitflags",
  "imgui-sys",
- "parking_lot",
+ "parking_lot 0.11.2",
 ]
 
 [[package]]
@@ -1145,7 +1356,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5af2c601e2bda3bdc6fd291c81f08c51bd04741f5ef2801d7e77324496cf12ce"
 dependencies = [
- "glium",
+ "glium 0.30.2",
  "imgui",
 ]
 
@@ -1219,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84"
+checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1246,25 +1457,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.112"
+version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
 
 [[package]]
 name = "libloading"
-version = "0.6.7"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
-dependencies = [
- "cfg-if 1.0.0",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52"
+checksum = "efbc0f03f9a775e9f6aed295c6a1ba2253c5757a9e03d55c6caa46a681abcddd"
 dependencies = [
  "cfg-if 1.0.0",
  "winapi",
@@ -1272,9 +1473,9 @@ dependencies = [
 
 [[package]]
 name = "lock_api"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
+checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
 dependencies = [
  "scopeguard",
 ]
@@ -1303,15 +1504,6 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
-[[package]]
-name = "memmap2"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.3.1"
@@ -1346,19 +1538,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "mio"
-version = "0.7.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
-dependencies = [
- "libc",
- "log",
- "miow",
- "ntapi",
- "winapi",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.0"
@@ -1372,18 +1551,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "mio-misc"
-version = "1.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c"
-dependencies = [
- "crossbeam",
- "crossbeam-queue",
- "log",
- "mio 0.7.14",
-]
-
 [[package]]
 name = "miow"
 version = "0.3.7"
@@ -1486,33 +1653,22 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
 
 [[package]]
 name = "nix"
-version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
-dependencies = [
- "bitflags",
- "cc",
- "cfg-if 0.1.10",
- "libc",
-]
-
-[[package]]
-name = "nix"
-version = "0.20.0"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf"
 dependencies = [
  "bitflags",
  "cc",
  "cfg-if 1.0.0",
  "libc",
+ "memoffset",
 ]
 
 [[package]]
 name = "nix"
-version = "0.22.0"
+version = "0.23.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf1e25ee6b412c2a1e3fcb6a4499a5c1bfe7f43e014bdce9a6b6666e5aa2d187"
+checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6"
 dependencies = [
  "bitflags",
  "cc",
@@ -1597,6 +1753,15 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "objc"
 version = "0.2.7"
@@ -1648,21 +1813,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
-name = "osmesa-sys"
-version = "0.1.2"
+name = "ordered-stream"
+version = "0.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
+checksum = "44630c059eacfd6e08bdaa51b1db2ce33119caa4ddc1235e923109aa5f25ccb1"
 dependencies = [
- "shared_library",
+ "futures-core",
+ "pin-project-lite",
 ]
 
 [[package]]
-name = "owned_ttf_parser"
-version = "0.6.0"
+name = "osmesa-sys"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
+checksum = "88cfece6e95d2e717e0872a7f53a8684712ad13822a7979bc760b9c77ec0013b"
 dependencies = [
- "ttf-parser 0.6.2",
+ "shared_library",
 ]
 
 [[package]]
@@ -1671,14 +1837,14 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ef05f2882a8b3e7acc10c153ade2631f7bfc8ce00d2bf3fb8f4e9d2ae6ea5c3"
 dependencies = [
- "ttf-parser 0.14.0",
+ "ttf-parser",
 ]
 
 [[package]]
 name = "pango-sys"
-version = "0.14.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2367099ca5e761546ba1d501955079f097caa186bb53ce0f718dca99ac1942fe"
+checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
 dependencies = [
  "glib-sys",
  "gobject-sys",
@@ -1686,6 +1852,12 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "parking"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72"
+
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -1694,7 +1866,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
 dependencies = [
  "instant",
  "lock_api",
- "parking_lot_core",
+ "parking_lot_core 0.8.5",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.1",
 ]
 
 [[package]]
@@ -1711,12 +1893,37 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "parking_lot_core"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-sys",
+]
+
 [[package]]
 name = "percent-encoding"
 version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e"
 
+[[package]]
+name = "pin-project-lite"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
 [[package]]
 name = "pkg-config"
 version = "0.3.24"
@@ -1751,6 +1958,31 @@ dependencies = [
  "plotters-backend",
 ]
 
+[[package]]
+name = "polling"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259"
+dependencies = [
+ "cfg-if 1.0.0",
+ "libc",
+ "log",
+ "wepoll-ffi",
+ "winapi",
+]
+
+[[package]]
+name = "pollster"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+
 [[package]]
 name = "proc-macro-crate"
 version = "0.1.5"
@@ -1788,7 +2020,7 @@ dependencies = [
  "byteorder",
  "criterion",
  "once_cell",
- "parking_lot",
+ "parking_lot 0.12.0",
  "ruzstd",
  "serde",
  "zstd",
@@ -1798,7 +2030,7 @@ dependencies = [
 name = "puffin-imgui"
 version = "0.15.0"
 dependencies = [
- "glium",
+ "glium 0.31.0",
  "imgui",
  "imgui-glium-renderer",
  "imgui-winit-support",
@@ -1857,13 +2089,53 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7"
+dependencies = [
+ "rand_core",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.3.4"
@@ -1933,6 +2205,8 @@ version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461"
 dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
@@ -1950,10 +2224,11 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
 
 [[package]]
 name = "rfd"
-version = "0.6.3"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b0c25b610bf37d9874ff224ab2791ff2272bedeb5638a2dca8b18e1270ed69b"
+checksum = "2aaf1d71ccd44689f7c2c72da1117fd8db71f72a76fe9b5c5dbb17ab903007e0"
 dependencies = [
+ "ashpd",
  "block",
  "dispatch",
  "glib-sys",
@@ -1961,9 +2236,11 @@ dependencies = [
  "gtk-sys",
  "js-sys",
  "lazy_static",
+ "log",
  "objc",
  "objc-foundation",
  "objc_id",
+ "pollster",
  "raw-window-handle 0.4.2",
  "wasm-bindgen",
  "wasm-bindgen-futures",
@@ -1997,16 +2274,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rusttype"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
-dependencies = [
- "ab_glyph_rasterizer",
- "owned_ttf_parser 0.6.0",
-]
-
 [[package]]
 name = "ruzstd"
 version = "0.2.4"
@@ -2046,15 +2313,15 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "semver"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012"
+checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7"
 
 [[package]]
 name = "serde"
-version = "1.0.133"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97565067517b60e2d1ea8b268e59ce036de907ac523ad83a0475da04e818989a"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
 dependencies = [
  "serde_derive",
 ]
@@ -2071,9 +2338,9 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.133"
+version = "1.0.136"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed201699328568d8d08208fdd080e3ff594e6c422e438b6705905da01005d537"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2082,15 +2349,41 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.74"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee2bb9cd061c5865d345bb02ca49fcef1391741b672b54a0bf7b679badec3142"
+checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085"
 dependencies = [
  "itoa 1.0.1",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "sha1"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "shared_library"
 version = "0.1.9"
@@ -2103,17 +2396,23 @@ dependencies = [
 
 [[package]]
 name = "simple_logger"
-version = "1.16.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45b60258a35dc3cb8a16890b8fd6723349bfa458d7960e25e633f1b1c19d7b5e"
+checksum = "c75a9723083573ace81ad0cdfc50b858aa3c366c48636edb4109d73122a0c0ea"
 dependencies = [
  "atty",
  "colored",
  "log",
- "time 0.3.5",
+ "time 0.3.7",
  "winapi",
 ]
 
+[[package]]
+name = "slab"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
+
 [[package]]
 name = "slotmap"
 version = "1.0.6"
@@ -2125,28 +2424,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
-
-[[package]]
-name = "smithay-client-toolkit"
-version = "0.12.3"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80"
-dependencies = [
- "andrew",
- "bitflags",
- "calloop 0.6.5",
- "dlib 0.4.2",
- "lazy_static",
- "log",
- "memmap2 0.1.0",
- "nix 0.18.0",
- "wayland-client 0.28.6",
- "wayland-cursor 0.28.6",
- "wayland-protocols 0.28.6",
-]
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
 [[package]]
 name = "smithay-client-toolkit"
@@ -2155,16 +2435,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a"
 dependencies = [
  "bitflags",
- "calloop 0.9.3",
- "dlib 0.5.0",
+ "calloop",
+ "dlib",
  "lazy_static",
  "log",
- "memmap2 0.3.1",
- "nix 0.22.0",
+ "memmap2",
+ "nix 0.22.3",
  "pkg-config",
- "wayland-client 0.29.4",
- "wayland-cursor 0.29.4",
- "wayland-protocols 0.29.4",
+ "wayland-client",
+ "wayland-cursor",
+ "wayland-protocols",
 ]
 
 [[package]]
@@ -2173,8 +2453,18 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55"
 dependencies = [
- "smithay-client-toolkit 0.15.3",
- "wayland-client 0.29.4",
+ "smithay-client-toolkit",
+ "wayland-client",
+]
+
+[[package]]
+name = "socket2"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
+dependencies = [
+ "libc",
+ "winapi",
 ]
 
 [[package]]
@@ -2195,29 +2485,11 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
-[[package]]
-name = "strum"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
-
-[[package]]
-name = "strum_macros"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "syn"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2226,18 +2498,13 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "3.2.0"
+version = "6.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
+checksum = "ad3a97fdef3daf935d929b3e97e5a6a680cd4622e40c2941ca0875d6566416f8"
 dependencies = [
- "anyhow",
  "cfg-expr",
- "heck",
- "itertools",
+ "heck 0.4.0",
  "pkg-config",
- "strum",
- "strum_macros",
- "thiserror",
  "toml",
  "version-compare",
 ]
@@ -2289,12 +2556,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad"
+checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d"
 dependencies = [
- "itoa 0.4.8",
+ "itoa 1.0.1",
  "libc",
+ "num_threads",
  "time-macros",
 ]
 
@@ -2323,12 +2591,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "ttf-parser"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
-
 [[package]]
 name = "ttf-parser"
 version = "0.14.0"
@@ -2347,9 +2609,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.8.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b"
+checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99"
 
 [[package]]
 name = "unicode-width"
@@ -2371,9 +2633,9 @@ checksum = "5fc1631c774f0f9570797191e01247cbefde789eebfbf128074cb934115a6133"
 
 [[package]]
 name = "version-compare"
-version = "0.0.11"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
+checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
 
 [[package]]
 name = "version_check"
@@ -2381,6 +2643,12 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
 [[package]]
 name = "walkdir"
 version = "2.3.2"
@@ -2400,9 +2668,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
  "cfg-if 1.0.0",
  "wasm-bindgen-macro",
@@ -2410,9 +2678,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -2425,9 +2693,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.28"
+version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39"
+checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395"
 dependencies = [
  "cfg-if 1.0.0",
  "js-sys",
@@ -2437,9 +2705,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2447,9 +2715,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2460,25 +2728,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.78"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc"
-
-[[package]]
-name = "wayland-client"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355"
-dependencies = [
- "bitflags",
- "downcast-rs",
- "libc",
- "nix 0.20.0",
- "scoped-tls",
- "wayland-commons 0.28.6",
- "wayland-scanner 0.28.6",
- "wayland-sys 0.28.6",
-]
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "wayland-client"
@@ -2489,23 +2741,11 @@ dependencies = [
  "bitflags",
  "downcast-rs",
  "libc",
- "nix 0.22.0",
+ "nix 0.22.3",
  "scoped-tls",
- "wayland-commons 0.29.4",
- "wayland-scanner 0.29.4",
- "wayland-sys 0.29.4",
-]
-
-[[package]]
-name = "wayland-commons"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
-dependencies = [
- "nix 0.20.0",
- "once_cell",
- "smallvec",
- "wayland-sys 0.28.6",
+ "wayland-commons",
+ "wayland-scanner",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -2514,21 +2754,10 @@ version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94f6e5e340d7c13490eca867898c4cec5af56c27a5ffe5c80c6fc4708e22d33e"
 dependencies = [
- "nix 0.22.0",
+ "nix 0.22.3",
  "once_cell",
  "smallvec",
- "wayland-sys 0.29.4",
-]
-
-[[package]]
-name = "wayland-cursor"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
-dependencies = [
- "nix 0.20.0",
- "wayland-client 0.28.6",
- "xcursor",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -2537,41 +2766,19 @@ version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
 dependencies = [
- "nix 0.22.0",
- "wayland-client 0.29.4",
+ "nix 0.22.3",
+ "wayland-client",
  "xcursor",
 ]
 
-[[package]]
-name = "wayland-egl"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956"
-dependencies = [
- "wayland-client 0.28.6",
- "wayland-sys 0.28.6",
-]
-
 [[package]]
 name = "wayland-egl"
 version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83281d69ee162b59031c666385e93bde4039ec553b90c4191cdb128ceea29a3a"
 dependencies = [
- "wayland-client 0.29.4",
- "wayland-sys 0.29.4",
-]
-
-[[package]]
-name = "wayland-protocols"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
-dependencies = [
- "bitflags",
- "wayland-client 0.28.6",
- "wayland-commons 0.28.6",
- "wayland-scanner 0.28.6",
+ "wayland-client",
+ "wayland-sys",
 ]
 
 [[package]]
@@ -2581,20 +2788,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
 dependencies = [
  "bitflags",
- "wayland-client 0.29.4",
- "wayland-commons 0.29.4",
- "wayland-scanner 0.29.4",
-]
-
-[[package]]
-name = "wayland-scanner"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1"
-dependencies = [
- "proc-macro2",
- "quote",
- "xml-rs",
+ "wayland-client",
+ "wayland-commons",
+ "wayland-scanner",
 ]
 
 [[package]]
@@ -2608,33 +2804,22 @@ dependencies = [
  "xml-rs",
 ]
 
-[[package]]
-name = "wayland-sys"
-version = "0.28.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
-dependencies = [
- "dlib 0.5.0",
- "lazy_static",
- "pkg-config",
-]
-
 [[package]]
 name = "wayland-sys"
 version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4"
 dependencies = [
- "dlib 0.5.0",
+ "dlib",
  "lazy_static",
  "pkg-config",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.55"
+version = "0.3.56"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb"
+checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2651,6 +2836,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "wepoll-ffi"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "widestring"
 version = "0.4.3"
@@ -2690,46 +2884,89 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac7fef12f4b59cd0a29339406cc9203ab44e440ddff6b3f5a41455349fa9cf3"
+checksum = "b749ebd2304aa012c5992d11a25d07b406bdbe5f79d371cb7a918ce501a19eb0"
 dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows_aarch64_msvc 0.30.0",
+ "windows_i686_gnu 0.30.0",
+ "windows_i686_msvc 0.30.0",
+ "windows_x86_64_gnu 0.30.0",
+ "windows_x86_64_msvc 0.30.0",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6"
+dependencies = [
+ "windows_aarch64_msvc 0.32.0",
+ "windows_i686_gnu 0.32.0",
+ "windows_i686_msvc 0.32.0",
+ "windows_x86_64_gnu 0.32.0",
+ "windows_x86_64_msvc 0.32.0",
+]
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29277a4435d642f775f63c7d1faeb927adba532886ce0287bd985bffb16b6bca"
+
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.29.0"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d027175d00b01e0cbeb97d6ab6ebe03b12330a35786cbaca5252b1c4bf5d9b"
+checksum = "1145e1989da93956c68d1864f32fb97c8f561a8f89a5125f6a2b7ea75524e4b8"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.29.0"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8793f59f7b8e8b01eda1a652b2697d87b93097198ae85f823b969ca5b89bba58"
+checksum = "d4a09e3a0d4753b73019db171c1339cd4362c8c44baf1bcea336235e955954a6"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8602f6c418b67024be2996c512f5f995de3ba417f4c75af68401ab8756796ae4"
+checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.29.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3d615f419543e0bd7d2b3323af0d86ff19cbc4f816e6453f36a2c2ce889c354"
+checksum = "8ca64fcb0220d58db4c119e050e7af03c69e6f4f415ef69ec1773d9aab422d5a"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.32.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08cabc9f0066848fef4bc6a1c1668e6efce38b661d2aeec75d18d8617eebb5f1"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.29.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d95421d9ed3672c280884da53201a5c46b7b2765ca6faf34b0d71cf34a3561"
+checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316"
 
 [[package]]
 name = "winit"
@@ -2747,20 +2984,14 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio 0.7.14",
- "mio-misc",
  "ndk 0.3.0",
  "ndk-glue 0.3.0",
  "ndk-sys",
  "objc",
- "parking_lot",
- "percent-encoding",
+ "parking_lot 0.11.2",
  "raw-window-handle 0.3.4",
  "scopeguard",
- "smithay-client-toolkit 0.12.3",
- "wayland-client 0.28.6",
  "winapi",
- "x11-dl",
 ]
 
 [[package]]
@@ -2779,18 +3010,18 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio 0.8.0",
+ "mio",
  "ndk 0.5.0",
  "ndk-glue 0.5.0",
  "ndk-sys",
  "objc",
- "parking_lot",
+ "parking_lot 0.11.2",
  "percent-encoding",
  "raw-window-handle 0.4.2",
- "smithay-client-toolkit 0.15.3",
+ "smithay-client-toolkit",
  "wasm-bindgen",
- "wayland-client 0.29.4",
- "wayland-protocols 0.29.4",
+ "wayland-client",
+ "wayland-protocols",
  "web-sys",
  "winapi",
  "x11-dl",
@@ -2837,19 +3068,71 @@ dependencies = [
 ]
 
 [[package]]
-name = "xdg"
-version = "2.4.0"
+name = "xml-rs"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803"
+checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+
+[[package]]
+name = "zbus"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bb86f3d4592e26a48b2719742aec94f8ae6238ebde20d98183ee185d1275e9a"
 dependencies = [
- "dirs",
+ "async-broadcast",
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "byteorder",
+ "derivative",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "hex",
+ "lazy_static",
+ "nix 0.23.1",
+ "once_cell",
+ "ordered-stream",
+ "rand",
+ "serde",
+ "serde_repr",
+ "sha1",
+ "static_assertions",
+ "winapi",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
 ]
 
 [[package]]
-name = "xml-rs"
-version = "0.8.4"
+name = "zbus_macros"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3"
+checksum = "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040"
+dependencies = [
+ "proc-macro-crate 1.1.0",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn",
+]
+
+[[package]]
+name = "zbus_names"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
+dependencies = [
+ "serde",
+ "static_assertions",
+ "zvariant",
+]
 
 [[package]]
 name = "zstd"
@@ -2879,3 +3162,29 @@ dependencies = [
  "cc",
  "libc",
 ]
+
+[[package]]
+name = "zvariant"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033"
+dependencies = [
+ "byteorder",
+ "enumflags2",
+ "libc",
+ "serde",
+ "static_assertions",
+ "zvariant_derive",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a"
+dependencies = [
+ "proc-macro-crate 1.1.0",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/puffin-imgui/Cargo.toml b/puffin-imgui/Cargo.toml
index cdf48305..c72cba89 100644
--- a/puffin-imgui/Cargo.toml
+++ b/puffin-imgui/Cargo.toml
@@ -19,7 +19,7 @@ puffin = { version = "0.12.0", path = "../puffin", features = ["packing"] }
 serde = { version = "1", features = ["derive"] }
 
 [dev-dependencies]
-glium = { version = "0.30", default-features = true }
+glium = { version = "0.31", default-features = true }
 imgui-glium-renderer = "0.8"
 imgui-winit-support = { version = "0.8", default-features = false, features = [
     "winit-25",
diff --git a/puffin/Cargo.toml b/puffin/Cargo.toml
index 0ca0d474..8033499c 100644
--- a/puffin/Cargo.toml
+++ b/puffin/Cargo.toml
@@ -10,20 +10,20 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "../README.md"
 categories = ["development-tools::profiling"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = [ "**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml"]
 
 [package.metadata.docs.rs]
 all-features = true
 
 [dependencies]
-byteorder = { version = "1" }
-once_cell = "1"
+byteorder = { version = "1.0" }
+once_cell = "1.0"
 
 # Optional:
-anyhow = { version = "1", optional = true }
+anyhow = { version = "1.0", optional = true }
 bincode = { version = "1.3", optional = true }
-parking_lot = { version = "0.11", optional = true }
-serde = { version = "1", features = ["derive", "rc"], optional = true }
+parking_lot = { version = "0.12", optional = true }
+serde = { version = "1.0", features = ["derive", "rc"], optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 zstd = { version = "0.10.0", optional = true } # native only
diff --git a/puffin_http/Cargo.toml b/puffin_http/Cargo.toml
index c2ca90dc..dd72fe79 100644
--- a/puffin_http/Cargo.toml
+++ b/puffin_http/Cargo.toml
@@ -10,13 +10,16 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling", "gui"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = [ "**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml"]
 
 [dependencies]
 anyhow = "1"
 crossbeam-channel = "0.5"
 log = "0.4"
-puffin = { version = "0.12.0", path = "../puffin", features = ["packing", "serialization"] }
+puffin = { version = "0.12.0", path = "../puffin", features = [
+    "packing",
+    "serialization",
+] }
 
 [dev-dependencies]
-simple_logger = "1.11"
+simple_logger = "2.1"
diff --git a/puffin_viewer/Cargo.toml b/puffin_viewer/Cargo.toml
index 1e0b9c7a..97420be6 100644
--- a/puffin_viewer/Cargo.toml
+++ b/puffin_viewer/Cargo.toml
@@ -10,18 +10,24 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling", "gui"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = [ "**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
 puffin_egui = { version = "0.12.0", path = "../puffin_egui" }
-puffin = { version = "0.12.0", path = "../puffin", features = ["packing", "serialization"] }
+puffin = { version = "0.12.0", path = "../puffin", features = [
+    "packing",
+    "serialization",
+] }
 puffin_http = { version = "0.9.0", path = "../puffin_http" }
 
 argh = "0.1"
-eframe = { version = "0.16.0", default-features = false, features = ["egui_glow", "persistence"] }
+eframe = { version = "0.16.0", default-features = false, features = [
+    "egui_glow",
+    "persistence",
+] }
 log = "0.4"
-rfd = "0.6.0"
-simple_logger = "1.11"
+rfd = "0.7.0"
+simple_logger = "2.1"

From 050c81396c0a8c0b0c8a9a11d27158ebc4057077 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:31:25 +0100
Subject: [PATCH 04/12] Fix puffin README

---
 puffin/Cargo.toml | 2 +-
 puffin/README.md  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)
 mode change 100644 => 120000 puffin/README.md

diff --git a/puffin/Cargo.toml b/puffin/Cargo.toml
index 8033499c..57affe39 100644
--- a/puffin/Cargo.toml
+++ b/puffin/Cargo.toml
@@ -7,7 +7,7 @@ description = "Simple instrumentation profiler for games"
 edition = "2018"
 homepage = "https://github.com/EmbarkStudios/puffin"
 repository = "https://github.com/EmbarkStudios/puffin"
-readme = "../README.md"
+readme = "README.md"
 categories = ["development-tools::profiling"]
 keywords = ["profiler", "instrumentation", "gamedev"]
 include = ["**/*.rs", "Cargo.toml"]
diff --git a/puffin/README.md b/puffin/README.md
deleted file mode 100644
index 921b133c..00000000
--- a/puffin/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Puffin
-
-This crate does the data collection for puffin. See parent `README.md` for more info.
diff --git a/puffin/README.md b/puffin/README.md
new file mode 120000
index 00000000..32d46ee8
--- /dev/null
+++ b/puffin/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file

From 108dee41d5ae9b638f9510e34d3e19dde3e27659 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:34:42 +0100
Subject: [PATCH 05/12] Really fix README

---
 puffin/README.md | 75 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 74 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 puffin/README.md

diff --git a/puffin/README.md b/puffin/README.md
deleted file mode 120000
index 32d46ee8..00000000
--- a/puffin/README.md
+++ /dev/null
@@ -1 +0,0 @@
-../README.md
\ No newline at end of file
diff --git a/puffin/README.md b/puffin/README.md
new file mode 100644
index 00000000..121a35a8
--- /dev/null
+++ b/puffin/README.md
@@ -0,0 +1,74 @@
+<div align="center">
+
+# `🐦 puffin`
+
+**The friendly little instrumentation profiler for Rust**
+
+![Puffin photo by Richard Bartz](puffin.jpg)
+
+[(puffin photo by Richard Bartz)](https://en.wikipedia.org/wiki/File:Papageitaucher_Fratercula_arctica.jpg)
+
+[![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev)
+[![Embark](https://img.shields.io/badge/discord-ark-%237289da.svg?logo=discord)](https://discord.gg/dAuKfZS)
+[![Crates.io](https://img.shields.io/crates/v/puffin.svg)](https://crates.io/crates/puffin)
+[![Docs](https://docs.rs/puffin/badge.svg)](https://docs.rs/puffin)
+[![dependency status](https://deps.rs/repo/github/EmbarkStudios/puffin/status.svg)](https://deps.rs/repo/github/EmbarkStudios/puffin)
+[![Build Status](https://github.com/EmbarkStudios/puffin/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/puffin/actions?workflow=CI)
+
+</div>
+
+## How to use
+
+``` rust
+fn my_function() {
+    puffin::profile_function!();
+    ...
+    if ... {
+        puffin::profile_scope!("load_image", image_name);
+        ...
+    }
+}
+```
+
+The Puffin macros write data to a thread-local data stream. When the outermost scope of a thread is closed, the data stream is sent to a global profiler collector. The scopes are pretty light-weight, costing around 100-200 nanoseconds.
+
+You have to turn on the profiler before it captures any data with a call to `puffin::set_scopes_on(true);`. When the profiler is off the profiler scope macros only has an overhead of 1-2 ns (and some stack space);
+
+Once per frame you need to call `puffin::GlobalProfiler::lock().new_frame();`.
+
+## UI
+
+To view the profile data in-game you can use [`puffin_egui`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_egui).
+
+![Puffin Flamegraph using puffin_egui](puffin_egui.gif)
+
+If you are using the [`imgui`](https://crates.io/crates/imgui) crate, there is also [`puffin-imgui`](https://github.com/EmbarkStudios/puffin/tree/main/puffin-imgui).
+
+## Remote profiling
+
+You can use [`puffin_http`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_http) to send profile events over TCP to [`puffin_viewer`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_http).
+
+## Other
+
+Also check out the crate [`profiling`](https://crates.io/crates/profiling) which provides a unifying layer of abstraction on top of `puffin` and other profiling crates.
+
+## Contributing
+
+[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](CODE_OF_CONDUCT.md)
+
+We welcome community contributions to this project.
+
+Please read our [Contributor Guide](CONTRIBUTING.md) for more information on how to get started.
+
+## License
+
+Licensed under either of
+
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.

From fc32dd3434206c3fbdc3756172130565cc4a32ae Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:37:28 +0100
Subject: [PATCH 06/12] Oops

---
 puffin/Cargo.toml |  2 +-
 puffin/README.md  | 75 +----------------------------------------------
 2 files changed, 2 insertions(+), 75 deletions(-)
 mode change 100644 => 120000 puffin/README.md

diff --git a/puffin/Cargo.toml b/puffin/Cargo.toml
index 57affe39..b77668d3 100644
--- a/puffin/Cargo.toml
+++ b/puffin/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = ["**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml", "README.md"]
 
 [package.metadata.docs.rs]
 all-features = true
diff --git a/puffin/README.md b/puffin/README.md
deleted file mode 100644
index 121a35a8..00000000
--- a/puffin/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-<div align="center">
-
-# `🐦 puffin`
-
-**The friendly little instrumentation profiler for Rust**
-
-![Puffin photo by Richard Bartz](puffin.jpg)
-
-[(puffin photo by Richard Bartz)](https://en.wikipedia.org/wiki/File:Papageitaucher_Fratercula_arctica.jpg)
-
-[![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev)
-[![Embark](https://img.shields.io/badge/discord-ark-%237289da.svg?logo=discord)](https://discord.gg/dAuKfZS)
-[![Crates.io](https://img.shields.io/crates/v/puffin.svg)](https://crates.io/crates/puffin)
-[![Docs](https://docs.rs/puffin/badge.svg)](https://docs.rs/puffin)
-[![dependency status](https://deps.rs/repo/github/EmbarkStudios/puffin/status.svg)](https://deps.rs/repo/github/EmbarkStudios/puffin)
-[![Build Status](https://github.com/EmbarkStudios/puffin/workflows/CI/badge.svg)](https://github.com/EmbarkStudios/puffin/actions?workflow=CI)
-
-</div>
-
-## How to use
-
-``` rust
-fn my_function() {
-    puffin::profile_function!();
-    ...
-    if ... {
-        puffin::profile_scope!("load_image", image_name);
-        ...
-    }
-}
-```
-
-The Puffin macros write data to a thread-local data stream. When the outermost scope of a thread is closed, the data stream is sent to a global profiler collector. The scopes are pretty light-weight, costing around 100-200 nanoseconds.
-
-You have to turn on the profiler before it captures any data with a call to `puffin::set_scopes_on(true);`. When the profiler is off the profiler scope macros only has an overhead of 1-2 ns (and some stack space);
-
-Once per frame you need to call `puffin::GlobalProfiler::lock().new_frame();`.
-
-## UI
-
-To view the profile data in-game you can use [`puffin_egui`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_egui).
-
-![Puffin Flamegraph using puffin_egui](puffin_egui.gif)
-
-If you are using the [`imgui`](https://crates.io/crates/imgui) crate, there is also [`puffin-imgui`](https://github.com/EmbarkStudios/puffin/tree/main/puffin-imgui).
-
-## Remote profiling
-
-You can use [`puffin_http`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_http) to send profile events over TCP to [`puffin_viewer`](https://github.com/EmbarkStudios/puffin/tree/main/puffin_http).
-
-## Other
-
-Also check out the crate [`profiling`](https://crates.io/crates/profiling) which provides a unifying layer of abstraction on top of `puffin` and other profiling crates.
-
-## Contributing
-
-[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](CODE_OF_CONDUCT.md)
-
-We welcome community contributions to this project.
-
-Please read our [Contributor Guide](CONTRIBUTING.md) for more information on how to get started.
-
-## License
-
-Licensed under either of
-
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any additional terms or conditions.
diff --git a/puffin/README.md b/puffin/README.md
new file mode 120000
index 00000000..32d46ee8
--- /dev/null
+++ b/puffin/README.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file

From 30f35c71b87fe656fb9db329741b603f0acdffe4 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 08:43:20 +0100
Subject: [PATCH 07/12] Fixup manifests

---
 puffin-imgui/Cargo.toml  |  4 ++--
 puffin_egui/Cargo.toml   | 17 ++++++++---------
 puffin_http/Cargo.toml   |  4 ++--
 puffin_viewer/Cargo.toml |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/puffin-imgui/Cargo.toml b/puffin-imgui/Cargo.toml
index c72cba89..e4f2b0b6 100644
--- a/puffin-imgui/Cargo.toml
+++ b/puffin-imgui/Cargo.toml
@@ -10,13 +10,13 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling", "gui"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = ["**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml", "README.md"]
 
 [dependencies]
 imgui = { version = "0.8" }
 natord = "1.0.9"
 puffin = { version = "0.12.0", path = "../puffin", features = ["packing"] }
-serde = { version = "1", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
 glium = { version = "0.31", default-features = true }
diff --git a/puffin_egui/Cargo.toml b/puffin_egui/Cargo.toml
index e3b2955a..1cd27a70 100644
--- a/puffin_egui/Cargo.toml
+++ b/puffin_egui/Cargo.toml
@@ -4,21 +4,18 @@ version = "0.12.0"
 authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
 description = "Show puffin profiler flamegraph in-game using egui"
 edition = "2018"
-homepage = "https://github.com/emilk/puffin_egui"
+homepage = "https://github.com/EmbarkStudios/puffin"
+repository = "https://github.com/EmbarkStudios/puffin"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
-repository = "https://github.com/emilk/puffin_egui"
-categories = [
-    "development-tools::profiling",
-    "game-development",
-    "gui",
-]
+categories = ["development-tools::profiling", "game-development", "gui"]
 keywords = ["profiler", "gamedev", "gui"]
 include = [
   "../LICENSE-APACHE",
   "../LICENSE-MIT",
   "**/*.rs",
   "Cargo.toml",
+  "README.md",
 ]
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -29,10 +26,12 @@ egui = "0.16.0"
 natord = "1.0.9"
 once_cell = "1.7"
 puffin = { version = "0.12.0", path = "../puffin", features = ["packing"] }
-serde = { version = "1", features = ["derive"], optional = true }
+serde = { version = "1.0", features = ["derive"], optional = true }
 vec1 = "1.8"
 
 [dev-dependencies]
-eframe = { version = "0.16.0", default-features = false, features = ["egui_glow"] }
+eframe = { version = "0.16.0", default-features = false, features = [
+  "egui_glow",
+] }
 # egui-macroquad = "0.7.0" # disabled until it is updated to egui 0.16
 # macroquad = "0.3" # disabled until it is updated to egui 0.16
diff --git a/puffin_http/Cargo.toml b/puffin_http/Cargo.toml
index dd72fe79..dbf35787 100644
--- a/puffin_http/Cargo.toml
+++ b/puffin_http/Cargo.toml
@@ -10,10 +10,10 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling", "gui"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = ["**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml", "README.md"]
 
 [dependencies]
-anyhow = "1"
+anyhow = "1.0"
 crossbeam-channel = "0.5"
 log = "0.4"
 puffin = { version = "0.12.0", path = "../puffin", features = [
diff --git a/puffin_viewer/Cargo.toml b/puffin_viewer/Cargo.toml
index 97420be6..96ce2ffd 100644
--- a/puffin_viewer/Cargo.toml
+++ b/puffin_viewer/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://github.com/EmbarkStudios/puffin"
 readme = "README.md"
 categories = ["development-tools::profiling", "gui"]
 keywords = ["profiler", "instrumentation", "gamedev"]
-include = ["**/*.rs", "Cargo.toml"]
+include = ["**/*.rs", "Cargo.toml", "README.md"]
 
 [lib]
 crate-type = ["cdylib", "rlib"]

From 65567722d7d2ffdaa2f68f5ca98dce77588441b0 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 09:22:32 +0100
Subject: [PATCH 08/12] Cleanup CI

---
 .github/workflows/ci.yml | 56 +++++++++-------------------------------
 1 file changed, 12 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b754bfe1..95c6262f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ name: CI
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/toolchain@v1
@@ -29,38 +29,21 @@ jobs:
       # make sure all code has been formatted with rustfmt
       - run: rustup component add rustfmt
       - name: rustfmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: -- --check --color always
+        run: cargo fmt -- --check --color always
 
       - run: rustup component add clippy
       - run: rustup target add wasm32-unknown-unknown
-      - name: cargo fetch
-        uses: actions-rs/cargo@v1
-        with:
-          command: fetch
+      - run: cargo fetch
       - name: cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --lib --tests -- -D warnings
-      - name: cargo check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all-targets
-      - name: cargo check wasm32
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: -p puffin_viewer --lib --target wasm32-unknown-unknown --all-features
+        run: cargo clippy --all-targets -- -D warnings
+      - name: cargo clippy wasm32
+        run: cargo clippy -p puffin_viewer --all-targets --target wasm32-unknown-unknown --all-features
 
   test:
     name: Test
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
+        os: [ubuntu-20.04, windows-latest, macOS-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
@@ -68,10 +51,7 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - name: cargo fetch
-        uses: actions-rs/cargo@v1
-        with:
-          command: fetch
+      - run: cargo fetch
       - name: Install packages (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -79,22 +59,10 @@ jobs:
           sudo apt-get -yq --no-install-suggests --no-install-recommends install libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libasound2-dev libxkbcommon-dev # egui_glium dependencies
           sudo apt-get install libgtk-3-dev # rfd dependencies
       - name: cargo test build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --tests --release
+        run: cargo build --tests --release --all-features
       - name: cargo test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: -p puffin -p puffin_egui -p puffin_http -p puffin-imgui -p --all-features
+        run: cargo test -p puffin -p puffin_egui -p puffin_http -p puffin-imgui --release --all-features
       - name: cargo test --doc
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --workspace --doc
+        run: cargo test --workspace --doc
       - name: cargo doc
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: -p puffin -p puffin_egui -p puffin_http -p puffin-imgui -p --lib --no-deps --all-features
+        run: cargo doc -p puffin -p puffin_egui -p puffin_http -p puffin-imgui -p --lib --no-deps --all-features

From 53ff0a12509fca7f03df30dbe184be129d6e5b77 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 09:22:47 +0100
Subject: [PATCH 09/12] Cleanup changelogs, setup release scripts

---
 CHANGELOG.md               |  28 +++++-----
 puffin-imgui/CHANGELOG.md  |  57 ++++++++++---------
 puffin-imgui/release.toml  |  10 ++++
 puffin_egui/CHANGELOG.md   | 111 ++++++++++++++++++++++++-------------
 puffin_egui/release.toml   |  10 ++++
 puffin_http/CHANGELOG.md   |  63 +++++++++++++--------
 puffin_http/release.toml   |  10 ++++
 puffin_viewer/CHANGELOG.md |  78 ++++++++++++++++----------
 puffin_viewer/release.toml |  10 ++++
 9 files changed, 246 insertions(+), 131 deletions(-)
 create mode 100644 puffin-imgui/release.toml
 create mode 100644 puffin_egui/release.toml
 create mode 100644 puffin_http/release.toml
 create mode 100644 puffin_viewer/release.toml

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fc4aa72..9579ab06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -77,17 +77,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * `GlobalProfiler` now store recent history and the slowest frames.
 
 <!-- next-url -->
-[Unreleased]: https://github.com/EmbarkStudios/krates/compare/0.12.1...HEAD
-[0.12.1]: https://github.com/EmbarkStudios/krates/compare/0.12.0...0.12.1
-[0.12.0]: https://github.com/EmbarkStudios/krates/compare/0.11.0...0.12.0
-[0.11.0]: https://github.com/EmbarkStudios/krates/compare/0.10.1...0.11.0
-[0.10.1]: https://github.com/EmbarkStudios/krates/compare/0.10.0...0.10.1
-[0.10.0]: https://github.com/EmbarkStudios/krates/compare/0.9.0...0.10.0
-[0.9.0]: https://github.com/EmbarkStudios/krates/compare/0.8.1...0.9.0
-[0.8.1]: https://github.com/EmbarkStudios/krates/compare/0.8.0...0.8.1
-[0.8.0]: https://github.com/EmbarkStudios/krates/compare/0.7.0...0.8.0
-[0.7.0]: https://github.com/EmbarkStudios/krates/compare/0.6.0...0.7.0
-[0.6.0]: https://github.com/EmbarkStudios/krates/compare/0.5.1...0.6.0
-[0.5.2]: https://github.com/EmbarkStudios/krates/compare/0.5.1...0.5.2
-[0.5.1]: https://github.com/EmbarkStudios/krates/compare/0.5.0...0.5.1
-[0.5.0]: https://github.com/EmbarkStudios/krates/releases/tag/0.5.0
+[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.12.1...HEAD
+[0.12.1]: https://github.com/EmbarkStudios/puffin/compare/0.12.0...0.12.1
+[0.12.0]: https://github.com/EmbarkStudios/puffin/compare/0.11.0...0.12.0
+[0.11.0]: https://github.com/EmbarkStudios/puffin/compare/0.10.1...0.11.0
+[0.10.1]: https://github.com/EmbarkStudios/puffin/compare/0.10.0...0.10.1
+[0.10.0]: https://github.com/EmbarkStudios/puffin/compare/0.9.0...0.10.0
+[0.9.0]: https://github.com/EmbarkStudios/puffin/compare/0.8.1...0.9.0
+[0.8.1]: https://github.com/EmbarkStudios/puffin/compare/0.8.0...0.8.1
+[0.8.0]: https://github.com/EmbarkStudios/puffin/compare/0.7.0...0.8.0
+[0.7.0]: https://github.com/EmbarkStudios/puffin/compare/0.6.0...0.7.0
+[0.6.0]: https://github.com/EmbarkStudios/puffin/compare/0.5.1...0.6.0
+[0.5.2]: https://github.com/EmbarkStudios/puffin/compare/0.5.1...0.5.2
+[0.5.1]: https://github.com/EmbarkStudios/puffin/compare/0.5.0...0.5.1
+[0.5.0]: https://github.com/EmbarkStudios/puffin/releases/tag/0.5.0
diff --git a/puffin-imgui/CHANGELOG.md b/puffin-imgui/CHANGELOG.md
index 9cc82388..92d0667c 100644
--- a/puffin-imgui/CHANGELOG.md
+++ b/puffin-imgui/CHANGELOG.md
@@ -1,58 +1,49 @@
+<!-- markdownlint-disable blanks-around-headings blanks-around-lists no-duplicate-heading -->
+
 # Changelog
 All notable changes to `puffin-imgui` will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+<!-- next-header -->
+## [Unreleased] - ReleaseDate
 
-## Unreleased
-
-
-## 0.15.0 - 2021-11-16
+## [0.15.0] - 2021-11-16
 * In-memory compression of frames to use up less RAM.
 
-
-## 0.14.0 - 2021-11-12
+## [0.14.0] - 2021-11-12
 * Add slider for controlling number of frames recorded.
 * Show total frames recorded and their total size.
 * Lower the default number of recorded frames to 600.
 * Add checkbox to toggle the profiling scopes.
 
-
-## 0.13.4 - 2021-11-05
+## [0.13.4] - 2021-11-05
 * Normalize frame height based on what frames are visible.
 
-
-## 0.13.3 - 2021-11-02
+## [0.13.3] - 2021-11-02
 * Fix occasional flickering when viewing merged scopes.
 
-
-## 0.13.2 - 2021-10-28
+## [0.13.2] - 2021-10-28
 * Add `ProfilerUi::global_frame_view` to access the profiler data.
 
-
-## 0.13.1 - 2021-10-21
+## [0.13.1] - 2021-10-21
 * Add a scope filter to focus on certain scopes.
 
-
-## 0.13.0 - 2021-10-12
+## [0.13.0] - 2021-10-12
 * Nothing new
 
-
-## 0.12.0 - 2021-09-20
+## [0.12.0] - 2021-09-20
 * Update to imgui 0.8.0
 
-
-## 0.11.0 - 2021-09-06
+## [0.11.0] - 2021-09-06
 * Update puffin
 
-
-## 0.10.0 - 2021-08-23
+## [0.10.0] - 2021-08-23
 * Fix "Toggle with spacebar." tooltip always showing.
 * Show frame index.
 
-
-## 0.9.0
+## [0.9.0]
 * Paint flamegraph top-down
 * Scrollable flamegraph
 * Option to sort threads by name
@@ -61,8 +52,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * More compact UI
 * Show all scopes (even tiny ones)
 
-
-## 0.8.0
+## [0.8.0]
 * Select frames from recent history or from among the slowest ever.
 * Nicer colors.
 * Simpler interaction (drag to pan, scroll to zoom, click to focus, double-click to reset).
+
+<!-- next-url -->
+[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.15.0...HEAD
+[0.15.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.14.0...puffin-imgui-0.15.0
+[0.14.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.13.4...puffin-imgui-0.14.0
+[0.13.4]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.13.3...puffin-imgui-0.13.4
+[0.13.3]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.13.2...puffin-imgui-0.13.3
+[0.13.2]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.13.1...puffin-imgui-0.13.2
+[0.13.1]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.13.0...puffin-imgui-0.13.1
+[0.13.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.12.0...puffin-imgui-0.13.0
+[0.12.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.11.0...puffin-imgui-0.12.0
+[0.11.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.10.0...puffin-imgui-0.11.0
+[0.10.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.9.0...puffin-imgui-0.10.0
+[0.9.0]: https://github.com/EmbarkStudios/puffin/compare/puffin-imgui-0.8.0...puffin-imgui-0.9.0
+[0.8.0]: https://github.com/EmbarkStudios/puffin/releases/tag/puffin-imgui-0.8.0
diff --git a/puffin-imgui/release.toml b/puffin-imgui/release.toml
new file mode 100644
index 00000000..649bb105
--- /dev/null
+++ b/puffin-imgui/release.toml
@@ -0,0 +1,10 @@
+pre-release-commit-message = "Release puffin-imgui-{{version}}"
+tag-message = "Release puffin-imgui-{{version}}"
+tag-name = "puffin-imgui-{{version}}"
+pre-release-replacements = [
+    { file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
+    { file = "CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}" },
+    { file = "CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}" },
+    { file = "CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate" },
+    { file = "CHANGELOG.md", search = "<!-- next-url -->", replace = "<!-- next-url -->\n[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/{{tag_name}}...HEAD" },
+]
diff --git a/puffin_egui/CHANGELOG.md b/puffin_egui/CHANGELOG.md
index afd151d3..1e6f0cc7 100644
--- a/puffin_egui/CHANGELOG.md
+++ b/puffin_egui/CHANGELOG.md
@@ -1,88 +1,121 @@
-# egui_puffin changelog
-
-All notable changes to the egui crate will be documented in this file.
+<!-- markdownlint-disable blanks-around-headings blanks-around-lists no-duplicate-heading -->
 
+# `egui_puffin` changelog
 
-## Unreleased
+All notable changes to the egui crate will be documented in this file.
 
+<!-- next-header -->
+## [Unreleased] - ReleaseDate
 
-## 0.12.0 - 2022-01-11
+## [0.12.0] - 2022-01-11
+### Changed
 * Update to `egui` 0.16.
-* Fix compilation for `wasm32-unknown-unknown`.
 
+### Fixed
+* Fix compilation for `wasm32-unknown-unknown`.
 
-## 0.11.0 - 2021-11-16
+## [0.11.0] - 2021-11-16
+### Added
 * Show total frames recorded and their total size.
-* In-memory compression of frames to use up less RAM.
 * Add slider to control how many recent frames to store.
 
+### Fixed
+* In-memory compression of frames to use up less RAM.
 
-## 0.10.3 - 2021-11-08
+## [0.10.3] - 2021-11-08
+### Fixed
 * Fix vertical scrolling in flamgraph.
-* Show thread names in stats tab.
 
+### Added
+* Show thread names in stats tab.
 
-## 0.10.2 - 2021-11-05
+## [0.10.2] - 2021-11-05
+### Fixed
 * Normalize frame height based on what frames are visible.
 
-
-## 0.10.1 - 2021-11-02
+## [0.10.1] - 2021-11-02
+### Added
 * Show scrollbar for history of recent frames.
 * Show date-time of when a frame was recorded.
 * Show compressed size of selected frame.
+
+### Fixed
 * Fix occasional flickering when viewing merged scopes.
 * Handle gaps in incoming frames.
 
-
-## 0.10.0 - 2021-10-29
+## [0.10.0] - 2021-10-29
+### Changed
 * Update to egui 0.15.
 
-
-## 0.9.1 - 2021-10-21
+## [0.9.1] - 2021-10-21
+### Added
 * Add a scope filter to focus on certain scopes.
 
-
-## 0.9.0 - 2021-10-12
+## [0.9.0] - 2021-10-12
+### Added
 * You can now select multiple frames.
 
-
-## 0.8.0 - 2021-09-20
+## [0.8.0] - 2021-09-20
+### Changed
 * `ProfilerUi` now takes by argument the profiling data to view. You may want to use `GlobalProfilerUi` instead.
 
-
-## 0.7.0 - 2021-09-06
+## [0.7.0] - 2021-09-06
+### Added
 * Add a stats panel for finding high-bandwidth scopes.
 
-
-## 0.6.0 - 2021-08-25
+## [0.6.0] - 2021-08-25
+### Changed
 * Update to egui 0.14
 
-
-## 0.5.0 - 2021-08-23
+## [0.5.0] - 2021-08-23
+### Changed
 * Show frame index.
 
-
-## 0.4.0 - 2021-07-05
+## [0.4.0] - 2021-07-05
+### Changed
 * Update to egui 0.13
 * Paint flamegraph top-down
+* More compact UI
+* Show all scopes (even tiny ones)
+
+### Added
 * Scrollable flamegraph
 * Option to sort threads by name
 * Drag with right mouse button to zoom
 * Toggle play/pause with spacebar
-* More compact UI
-* Show all scopes (even tiny ones)
-
 
-## 0.3.0 - 2021-05-27
+## [0.3.0] - 2021-05-27
+### Added
 * History viewer.
-* Update to puffin 0.5.1.
 
+### Changed
+* Update to puffin 0.5.1.
 
-## 0.2.0 - 2021-05-13
+## [0.2.0] - 2021-05-13
+### Changed
 * Update to egui 0.12.
 * Remove drag-to-zoom (scroll to zoom instead).
 
-
-## 0.1.0 - 2021-05-05 - Initial release
-Show flamegraph plot of either latest frame, a spike frame, or a paused frame.
-The view supports viewing merged sibling scopes.
+## [0.1.0] - 2021-05-05
+### Added
+* Show flamegraph plot of either latest frame, a spike frame, or a paused frame.
+* The view supports viewing merged sibling scopes.
+
+<!-- next-url -->
+[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.12.0...HEAD
+[0.12.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.11.0...puffin_egui-0.12.0
+[0.11.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.10.3...puffin_egui-0.11.0
+[0.10.3]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.10.2...puffin_egui-0.10.3
+[0.10.2]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.10.1...puffin_egui-0.10.2
+[0.10.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.10.0...puffin_egui-0.10.1
+[0.10.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.9.0...puffin_egui-0.10.0
+[0.9.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.9.0...puffin_egui-0.9.1
+[0.9.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.8.0...puffin_egui-0.9.0
+[0.8.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.7.0...puffin_egui-0.8.0
+[0.7.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.6.0...puffin_egui-0.7.0
+[0.6.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.5.0...puffin_egui-0.6.0
+[0.5.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.4.0...puffin_egui-0.5.0
+[0.4.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.3.0...puffin_egui-0.4.0
+[0.3.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.2.1...puffin_egui-0.3.0
+[0.2.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_egui-0.1.0...puffin_egui-0.2.1
+[0.1.0]: https://github.com/EmbarkStudios/puffin/releases/tag/puffin_egui-0.1.0
diff --git a/puffin_egui/release.toml b/puffin_egui/release.toml
new file mode 100644
index 00000000..5e6b18a0
--- /dev/null
+++ b/puffin_egui/release.toml
@@ -0,0 +1,10 @@
+pre-release-commit-message = "Release puffin_egui-{{version}}"
+tag-message = "Release puffin_egui-{{version}}"
+tag-name = "puffin_egui-{{version}}"
+pre-release-replacements = [
+    { file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
+    { file = "CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}" },
+    { file = "CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}" },
+    { file = "CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate" },
+    { file = "CHANGELOG.md", search = "<!-- next-url -->", replace = "<!-- next-url -->\n[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/{{tag_name}}...HEAD" },
+]
diff --git a/puffin_http/CHANGELOG.md b/puffin_http/CHANGELOG.md
index 86a934c3..d49f21fe 100644
--- a/puffin_http/CHANGELOG.md
+++ b/puffin_http/CHANGELOG.md
@@ -1,51 +1,66 @@
+<!-- markdownlint-disable blanks-around-headings blanks-around-lists no-duplicate-heading -->
+
 # Changelog
 
 All notable changes to `puffin_http` will be documented in this file.
 
+<!-- next-header -->
+## [Unreleased] - ReleaseDate
 
-## Unreleased
-
-
-## 0.9.0 - 2021-11-16
+## [0.9.0] - 2021-11-16
+### Changed
 * In-memory compression of frames to use up less RAM.
 
-
-## 0.8.0 - 2021-11-12
+## [0.8.0] - 2021-11-12
+### Changed
 * Update to puffin 0.11.0.
 
-
-## 0.7.3 - 2021-11-08
+## [0.7.3] - 2021-11-08
+### Added
 * Add `Server::num_clients`.
 
-
-## 0.7.2 - 2021-10-28
+## [0.7.2] - 2021-10-28
+### Fixed
 * Send all outstanding frames on shutdown.
 
-
-## 0.7.0 - 2021-10-12
+## [0.7.0] - 2021-10-12
+### Fixed
 * Nothing new.
 
-
-## 0.6.0 - 2021-09-20
+## [0.6.0] - 2021-09-20
+### Changed
 * Better handle slow clients, especially when there are multiple clients.
 
-
-## 0.5.1 - 2021-09-16
+## [0.5.1] - 2021-09-16
+### Fixed
 * Fix high-bandwidth connection interruptions.
 
-
-## 0.5.0 - 2021-09-06
+## [0.5.0] - 2021-09-06
+### Changed
 * Switch from lz4 to zstd compression for 50% file size and bandwidth reduction.
 
-
-## 0.4.1 - 2021-08-24
+## [0.4.1] - 2021-08-24
+### Fixed
 * Do less work when no clients are connected.
 
-
-## 0.4.0 - 2021-08-23
+## [0.4.0] - 2021-08-23
+### Changed
 * Remove `Server::update` (no longer needed).
 * Compress the TCP stream (approximately 75% bandwidth reduction).
 
-
-## 0.3.0
+## [0.3.0]
+### Added
 * Initial release
+
+<!-- next-url -->
+[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.9.0...HEAD
+[0.9.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.8.0...puffin_http-0.9.0
+[0.8.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.7.3...puffin_http-0.8.0
+[0.7.3]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.7.2...puffin_http-0.7.3
+[0.7.2]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.7.0...puffin_http-0.7.2
+[0.7.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.6.0...puffin_http-0.7.0
+[0.6.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.5.1...puffin_http-0.6.0
+[0.5.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.5.0...puffin_http-0.5.1
+[0.5.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.4.0...puffin_http-0.5.0
+[0.4.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_http-0.3.0...puffin_http-0.4.0
+[0.3.0]: https://github.com/EmbarkStudios/puffin/releases/tag/puffin_http-0.3.0
diff --git a/puffin_http/release.toml b/puffin_http/release.toml
new file mode 100644
index 00000000..4011fbed
--- /dev/null
+++ b/puffin_http/release.toml
@@ -0,0 +1,10 @@
+pre-release-commit-message = "Release puffin_http-{{version}}"
+tag-message = "Release puffin_http-{{version}}"
+tag-name = "puffin_http-{{version}}"
+pre-release-replacements = [
+    { file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
+    { file = "CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}" },
+    { file = "CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}" },
+    { file = "CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate" },
+    { file = "CHANGELOG.md", search = "<!-- next-url -->", replace = "<!-- next-url -->\n[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/{{tag_name}}...HEAD" },
+]
diff --git a/puffin_viewer/CHANGELOG.md b/puffin_viewer/CHANGELOG.md
index 9678eebb..e300bc5b 100644
--- a/puffin_viewer/CHANGELOG.md
+++ b/puffin_viewer/CHANGELOG.md
@@ -1,62 +1,84 @@
+<!-- markdownlint-disable blanks-around-headings blanks-around-lists no-duplicate-heading -->
+
 # Changelog
 
 All notable changes to `puffin_viewer` will be documented in this file.
 
+<!-- next-header -->
+## [Unreleased] - ReleaseDate
 
-## Unreleased
-
-
-## 0.10.1 - 2022-01-11
+## [0.10.1] - 2022-01-11
+### Changed
 * Update to latest `eframe` and `winit`
 * Swich renderer from `egui_glium` to `egui_glow`.
 
-
-## 0.10.0 - 2021-11-16
+## [0.10.0] - 2021-11-16
+### Changed
 * In-memory compression of frames to use up less RAM.
+
+### Added
 * Add slider to control how many recent frames to store.
 * Add ability to profile `puffin_viewer` from itself.
 
-
-## 0.9.2 - 2021-11-08
+## [0.9.2] - 2021-11-08
+### Fixed
 * Fix vertical scrolling in flamgraph
 
-
-## 0.9.1 - 2021-11-05
+## [0.9.1] - 2021-11-05
+### Fixed
 * Normalize frame height based on what frames are visible.
 
-
-## 0.9.0 - 2021-11-02
+## [0.9.0] - 2021-11-02
+### Changed
 * Use [`egui_glow`](https://github.com/emilk/egui/tree/master/egui_glow) backend (slightly experimental, but compiles and runs faster).
 
-
-## 0.8.0 - 2021-10-29
+## [0.8.0] - 2021-10-29
+### Changed
 * Change `--file` option to instead be a positional argument.
 
-
-## 0.7.1 - 2021-10-21
+## [0.7.1] - 2021-10-21
+### Added
 * Add a scope filter to focus on certain scopes.
 
-
-## 0.7.0 - 2021-10-12
+## [0.7.0] - 2021-10-12
+### Added
 * You can now select multiple frames.
 
-
-## 0.6.1 - 2021-09-08
+## [0.6.1] - 2021-09-08
+### Fixed
 * Fix deadlock when saving a file.
 
-
-## 0.6.0 - 2021-09-06
+## [0.6.0] - 2021-09-06
+### Changed
 * Better compressed network stream and files (50% smaller).
-* Added stats view to find unnecessary scopes.
 
+### Added
+* Added stats view to find unnecessary scopes.
 
-## 0.5.0
+## [0.5.0]
+### Added
 * Load and save recordings as `.puffin` files.
 
-
-## 0.4.0
+## [0.4.0]
+### Added
 * Add support for compressed TCP stream (up to 75% bandwidth reduction).
 
-
-## 0.3.0
+## [0.3.0]
+### Added
 First release: connect to a `puffin_server` over HTTP to live view a profiler stream
+
+<!-- next-url -->
+[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.9.0...HEAD
+[0.10.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.10.0...puffin_viewer-0.10.1
+[0.10.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.9.2...puffin_viewer-0.10.0
+[0.9.2]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.9.1...puffin_viewer-0.9.2
+[0.9.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.9.0...puffin_viewer-0.9.1
+[0.9.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.8.0...puffin_viewer-0.9.0
+[0.8.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.7.1...puffin_viewer-0.8.0
+[0.7.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.7.0...puffin_viewer-0.7.1
+[0.7.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.6.1...puffin_viewer-0.7.0
+[0.6.1]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.6.0...puffin_viewer-0.6.1
+[0.6.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.5.0...puffin_viewer-0.6.0
+[0.5.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.4.0...puffin_viewer-0.5.0
+[0.4.0]: https://github.com/EmbarkStudios/puffin/compare/puffin_viewer-0.3.0...puffin_viewer-0.4.0
+[0.3.0]: https://github.com/EmbarkStudios/puffin/releases/tag/puffin_viewer-0.3.0
diff --git a/puffin_viewer/release.toml b/puffin_viewer/release.toml
new file mode 100644
index 00000000..1115a9b3
--- /dev/null
+++ b/puffin_viewer/release.toml
@@ -0,0 +1,10 @@
+pre-release-commit-message = "Release puffin_viewer-{{version}}"
+tag-message = "Release puffin_viewer-{{version}}"
+tag-name = "puffin_viewer-{{version}}"
+pre-release-replacements = [
+    { file = "CHANGELOG.md", search = "Unreleased", replace = "{{version}}" },
+    { file = "CHANGELOG.md", search = "\\.\\.\\.HEAD", replace = "...{{tag_name}}" },
+    { file = "CHANGELOG.md", search = "ReleaseDate", replace = "{{date}}" },
+    { file = "CHANGELOG.md", search = "<!-- next-header -->", replace = "<!-- next-header -->\n## [Unreleased] - ReleaseDate" },
+    { file = "CHANGELOG.md", search = "<!-- next-url -->", replace = "<!-- next-url -->\n[Unreleased]: https://github.com/EmbarkStudios/puffin/compare/{{tag_name}}...HEAD" },
+]

From 1ae85ab8f3cacc872287cc8f509392b168fa0c8d Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 09:37:07 +0100
Subject: [PATCH 10/12] Fix build

---
 Cargo.lock              | 394 +++++++++++++++++++++++++++++++++++-----
 puffin-imgui/Cargo.toml |   3 +-
 2 files changed, 348 insertions(+), 49 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e658060c..ded2fe47 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,7 +9,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61caed9aec6daeee1ea38ccf5fb225e4f96c1eeead1b4a5c267324a63cf02326"
 dependencies = [
  "ab_glyph_rasterizer",
- "owned_ttf_parser",
+ "owned_ttf_parser 0.14.0",
 ]
 
 [[package]]
@@ -54,6 +54,19 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "andrew"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf"
+dependencies = [
+ "bitflags",
+ "rusttype",
+ "walkdir",
+ "xdg",
+ "xml-rs",
+]
+
 [[package]]
 name = "android_glue"
 version = "0.2.3"
@@ -318,6 +331,16 @@ dependencies = [
  "system-deps",
 ]
 
+[[package]]
+name = "calloop"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
+dependencies = [
+ "log",
+ "nix 0.18.0",
+]
+
 [[package]]
 name = "calloop"
 version = "0.9.3"
@@ -599,6 +622,20 @@ dependencies = [
  "itertools",
 ]
 
+[[package]]
+name = "crossbeam"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-channel"
 version = "0.5.2"
@@ -633,6 +670,16 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4dd435b205a4842da59efd07628f921c096bc1cc0a156835b4fa0bcb9a19bcce"
+dependencies = [
+ "cfg-if 1.0.0",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-utils"
 version = "0.8.7"
@@ -762,6 +809,26 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs"
+version = "3.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
 [[package]]
 name = "dirs-sys-next"
 version = "0.1.2"
@@ -779,13 +846,22 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b"
 
+[[package]]
+name = "dlib"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b11f15d1e3268f140f68d390637d5e76d849782d971ae7063e0da69fe9709a76"
+dependencies = [
+ "libloading 0.6.7",
+]
+
 [[package]]
 name = "dlib"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac1b7517328c04c2aa68422fc60a41b92208182142ed04a25879c26c8f878794"
 dependencies = [
- "libloading",
+ "libloading 0.7.3",
 ]
 
 [[package]]
@@ -850,7 +926,7 @@ dependencies = [
  "egui-winit",
  "epi",
  "glow",
- "glutin",
+ "glutin 0.28.0",
  "memoffset",
  "wasm-bindgen",
  "web-sys",
@@ -1162,22 +1238,7 @@ dependencies = [
  "backtrace",
  "fnv",
  "gl_generator",
- "lazy_static",
- "memoffset",
- "smallvec",
- "takeable-option",
-]
-
-[[package]]
-name = "glium"
-version = "0.31.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ab4f09b43d8ee427a700cb9ed3b20e0e858d62a509edded1a98ca5707d68e19"
-dependencies = [
- "backtrace",
- "fnv",
- "gl_generator",
- "glutin",
+ "glutin 0.27.0",
  "lazy_static",
  "memoffset",
  "smallvec",
@@ -1196,6 +1257,33 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "glutin"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "762d6cd2e1b855d99668ebe591cc9058659d85ac39a9a2078000eb122ddba8f0"
+dependencies = [
+ "android_glue",
+ "cgl",
+ "cocoa",
+ "core-foundation 0.9.2",
+ "glutin_egl_sys",
+ "glutin_emscripten_sys",
+ "glutin_gles2_sys",
+ "glutin_glx_sys",
+ "glutin_wgl_sys",
+ "lazy_static",
+ "libloading 0.7.3",
+ "log",
+ "objc",
+ "osmesa-sys",
+ "parking_lot 0.11.2",
+ "wayland-client 0.28.6",
+ "wayland-egl 0.28.6",
+ "winapi",
+ "winit 0.25.0",
+]
+
 [[package]]
 name = "glutin"
 version = "0.28.0"
@@ -1212,13 +1300,13 @@ dependencies = [
  "glutin_glx_sys",
  "glutin_wgl_sys",
  "lazy_static",
- "libloading",
+ "libloading 0.7.3",
  "log",
  "objc",
  "osmesa-sys",
  "parking_lot 0.11.2",
- "wayland-client",
- "wayland-egl",
+ "wayland-client 0.29.4",
+ "wayland-egl 0.29.4",
  "winapi",
  "winit 0.26.1",
 ]
@@ -1356,7 +1444,7 @@ version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5af2c601e2bda3bdc6fd291c81f08c51bd04741f5ef2801d7e77324496cf12ce"
 dependencies = [
- "glium 0.30.2",
+ "glium",
  "imgui",
 ]
 
@@ -1461,6 +1549,16 @@ version = "0.2.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c"
 
+[[package]]
+name = "libloading"
+version = "0.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
+dependencies = [
+ "cfg-if 1.0.0",
+ "winapi",
+]
+
 [[package]]
 name = "libloading"
 version = "0.7.3"
@@ -1504,6 +1602,15 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
 
+[[package]]
+name = "memmap2"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b70ca2a6103ac8b665dc150b142ef0e4e89df640c9e6cf295d189c3caebe5a"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memmap2"
 version = "0.3.1"
@@ -1538,6 +1645,19 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "mio"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
+dependencies = [
+ "libc",
+ "log",
+ "miow",
+ "ntapi",
+ "winapi",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.0"
@@ -1551,6 +1671,18 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "mio-misc"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b47412f3a52115b936ff2a229b803498c7b4d332adeb87c2f1498c9da54c398c"
+dependencies = [
+ "crossbeam",
+ "crossbeam-queue",
+ "log",
+ "mio 0.7.14",
+]
+
 [[package]]
 name = "miow"
 version = "0.3.7"
@@ -1651,6 +1783,30 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121"
 
+[[package]]
+name = "nix"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 0.1.10",
+ "libc",
+]
+
+[[package]]
+name = "nix"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
+dependencies = [
+ "bitflags",
+ "cc",
+ "cfg-if 1.0.0",
+ "libc",
+]
+
 [[package]]
 name = "nix"
 version = "0.22.3"
@@ -1831,13 +1987,22 @@ dependencies = [
  "shared_library",
 ]
 
+[[package]]
+name = "owned_ttf_parser"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
+dependencies = [
+ "ttf-parser 0.6.2",
+]
+
 [[package]]
 name = "owned_ttf_parser"
 version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ef05f2882a8b3e7acc10c153ade2631f7bfc8ce00d2bf3fb8f4e9d2ae6ea5c3"
 dependencies = [
- "ttf-parser",
+ "ttf-parser 0.14.0",
 ]
 
 [[package]]
@@ -2030,7 +2195,7 @@ dependencies = [
 name = "puffin-imgui"
 version = "0.15.0"
 dependencies = [
- "glium 0.31.0",
+ "glium",
  "imgui",
  "imgui-glium-renderer",
  "imgui-winit-support",
@@ -2274,6 +2439,16 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "rusttype"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser 0.6.0",
+]
+
 [[package]]
 name = "ruzstd"
 version = "0.2.4"
@@ -2428,6 +2603,25 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
 
+[[package]]
+name = "smithay-client-toolkit"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4750c76fd5d3ac95fa3ed80fe667d6a3d8590a960e5b575b98eea93339a80b80"
+dependencies = [
+ "andrew",
+ "bitflags",
+ "calloop 0.6.5",
+ "dlib 0.4.2",
+ "lazy_static",
+ "log",
+ "memmap2 0.1.0",
+ "nix 0.18.0",
+ "wayland-client 0.28.6",
+ "wayland-cursor 0.28.6",
+ "wayland-protocols 0.28.6",
+]
+
 [[package]]
 name = "smithay-client-toolkit"
 version = "0.15.3"
@@ -2435,16 +2629,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1325f292209cee78d5035530932422a30aa4c8fda1a16593ac083c1de211e68a"
 dependencies = [
  "bitflags",
- "calloop",
- "dlib",
+ "calloop 0.9.3",
+ "dlib 0.5.0",
  "lazy_static",
  "log",
- "memmap2",
+ "memmap2 0.3.1",
  "nix 0.22.3",
  "pkg-config",
- "wayland-client",
- "wayland-cursor",
- "wayland-protocols",
+ "wayland-client 0.29.4",
+ "wayland-cursor 0.29.4",
+ "wayland-protocols 0.29.4",
 ]
 
 [[package]]
@@ -2453,8 +2647,8 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "610b551bd25378bfd2b8e7a0fcbd83d427e8f2f6a40c47ae0f70688e9949dd55"
 dependencies = [
- "smithay-client-toolkit",
- "wayland-client",
+ "smithay-client-toolkit 0.15.3",
+ "wayland-client 0.29.4",
 ]
 
 [[package]]
@@ -2591,6 +2785,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ttf-parser"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
+
 [[package]]
 name = "ttf-parser"
 version = "0.14.0"
@@ -2732,6 +2932,22 @@ version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
+[[package]]
+name = "wayland-client"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3ab332350e502f159382201394a78e3cc12d0f04db863429260164ea40e0355"
+dependencies = [
+ "bitflags",
+ "downcast-rs",
+ "libc",
+ "nix 0.20.0",
+ "scoped-tls",
+ "wayland-commons 0.28.6",
+ "wayland-scanner 0.28.6",
+ "wayland-sys 0.28.6",
+]
+
 [[package]]
 name = "wayland-client"
 version = "0.29.4"
@@ -2743,9 +2959,21 @@ dependencies = [
  "libc",
  "nix 0.22.3",
  "scoped-tls",
- "wayland-commons",
- "wayland-scanner",
- "wayland-sys",
+ "wayland-commons 0.29.4",
+ "wayland-scanner 0.29.4",
+ "wayland-sys 0.29.4",
+]
+
+[[package]]
+name = "wayland-commons"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21817947c7011bbd0a27e11b17b337bfd022e8544b071a2641232047966fbda"
+dependencies = [
+ "nix 0.20.0",
+ "once_cell",
+ "smallvec",
+ "wayland-sys 0.28.6",
 ]
 
 [[package]]
@@ -2757,7 +2985,18 @@ dependencies = [
  "nix 0.22.3",
  "once_cell",
  "smallvec",
- "wayland-sys",
+ "wayland-sys 0.29.4",
+]
+
+[[package]]
+name = "wayland-cursor"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be610084edd1586d45e7bdd275fe345c7c1873598caa464c4fb835dee70fa65a"
+dependencies = [
+ "nix 0.20.0",
+ "wayland-client 0.28.6",
+ "xcursor",
 ]
 
 [[package]]
@@ -2767,18 +3006,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c52758f13d5e7861fc83d942d3d99bf270c83269575e52ac29e5b73cb956a6bd"
 dependencies = [
  "nix 0.22.3",
- "wayland-client",
+ "wayland-client 0.29.4",
  "xcursor",
 ]
 
+[[package]]
+name = "wayland-egl"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99ba1ab1e18756b23982d36f08856d521d7df45015f404a2d7c4f0b2d2f66956"
+dependencies = [
+ "wayland-client 0.28.6",
+ "wayland-sys 0.28.6",
+]
+
 [[package]]
 name = "wayland-egl"
 version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83281d69ee162b59031c666385e93bde4039ec553b90c4191cdb128ceea29a3a"
 dependencies = [
- "wayland-client",
- "wayland-sys",
+ "wayland-client 0.29.4",
+ "wayland-sys 0.29.4",
+]
+
+[[package]]
+name = "wayland-protocols"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "286620ea4d803bacf61fa087a4242ee316693099ee5a140796aaba02b29f861f"
+dependencies = [
+ "bitflags",
+ "wayland-client 0.28.6",
+ "wayland-commons 0.28.6",
+ "wayland-scanner 0.28.6",
 ]
 
 [[package]]
@@ -2788,9 +3049,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "60147ae23303402e41fe034f74fb2c35ad0780ee88a1c40ac09a3be1e7465741"
 dependencies = [
  "bitflags",
- "wayland-client",
- "wayland-commons",
- "wayland-scanner",
+ "wayland-client 0.29.4",
+ "wayland-commons 0.29.4",
+ "wayland-scanner 0.29.4",
+]
+
+[[package]]
+name = "wayland-scanner"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce923eb2deb61de332d1f356ec7b6bf37094dc5573952e1c8936db03b54c03f1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "xml-rs",
 ]
 
 [[package]]
@@ -2804,13 +3076,24 @@ dependencies = [
  "xml-rs",
 ]
 
+[[package]]
+name = "wayland-sys"
+version = "0.28.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d841fca9aed7febf9bed2e9796c49bf58d4152ceda8ac949ebe00868d8f0feb8"
+dependencies = [
+ "dlib 0.5.0",
+ "lazy_static",
+ "pkg-config",
+]
+
 [[package]]
 name = "wayland-sys"
 version = "0.29.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9341df79a8975679188e37dab3889bfa57c44ac2cb6da166f519a81cbe452d4"
 dependencies = [
- "dlib",
+ "dlib 0.5.0",
  "lazy_static",
  "pkg-config",
 ]
@@ -2984,14 +3267,20 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
+ "mio 0.7.14",
+ "mio-misc",
  "ndk 0.3.0",
  "ndk-glue 0.3.0",
  "ndk-sys",
  "objc",
  "parking_lot 0.11.2",
+ "percent-encoding",
  "raw-window-handle 0.3.4",
  "scopeguard",
+ "smithay-client-toolkit 0.12.3",
+ "wayland-client 0.28.6",
  "winapi",
+ "x11-dl",
 ]
 
 [[package]]
@@ -3010,7 +3299,7 @@ dependencies = [
  "lazy_static",
  "libc",
  "log",
- "mio",
+ "mio 0.8.0",
  "ndk 0.5.0",
  "ndk-glue 0.5.0",
  "ndk-sys",
@@ -3018,10 +3307,10 @@ dependencies = [
  "parking_lot 0.11.2",
  "percent-encoding",
  "raw-window-handle 0.4.2",
- "smithay-client-toolkit",
+ "smithay-client-toolkit 0.15.3",
  "wasm-bindgen",
- "wayland-client",
- "wayland-protocols",
+ "wayland-client 0.29.4",
+ "wayland-protocols 0.29.4",
  "web-sys",
  "winapi",
  "x11-dl",
@@ -3067,6 +3356,15 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "xdg"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a23fe958c70412687039c86f578938b4a0bb50ec788e96bce4d6ab00ddd5803"
+dependencies = [
+ "dirs",
+]
+
 [[package]]
 name = "xml-rs"
 version = "0.8.4"
diff --git a/puffin-imgui/Cargo.toml b/puffin-imgui/Cargo.toml
index e4f2b0b6..eddc4aea 100644
--- a/puffin-imgui/Cargo.toml
+++ b/puffin-imgui/Cargo.toml
@@ -19,7 +19,8 @@ puffin = { version = "0.12.0", path = "../puffin", features = ["packing"] }
 serde = { version = "1.0", features = ["derive"] }
 
 [dev-dependencies]
-glium = { version = "0.31", default-features = true }
+# Stuck on this version until imgui-glium updates
+glium = { version = "0.30", default-features = true }
 imgui-glium-renderer = "0.8"
 imgui-winit-support = { version = "0.8", default-features = false, features = [
     "winit-25",

From 2b42bb331a0ad8710f06b2f2781e5b672512883d Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 09:59:52 +0100
Subject: [PATCH 11/12] Add PR to CHANGELOGs

---
 CHANGELOG.md               |  1 +
 puffin-imgui/CHANGELOG.md  | 68 +++++++++++++++++++++++-------------
 puffin_egui/CHANGELOG.md   | 70 ++++++++++++++++++++------------------
 puffin_http/CHANGELOG.md   | 26 +++++++-------
 puffin_viewer/CHANGELOG.md | 34 +++++++++---------
 5 files changed, 113 insertions(+), 86 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9579ab06..b2150162 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 * Upgrade `ztd` v0.9 -> v0.10
+* [PR#64](https://github.com/EmbarkStudios/puffin/pull/64) updated dependencies and cleaned up crate metadata.
 
 ## [0.12.1] - 2021-11-16
 ### Fixed
diff --git a/puffin-imgui/CHANGELOG.md b/puffin-imgui/CHANGELOG.md
index 92d0667c..e7b8ff1f 100644
--- a/puffin-imgui/CHANGELOG.md
+++ b/puffin-imgui/CHANGELOG.md
@@ -8,54 +8,74 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#64](https://github.com/EmbarkStudios/puffin/pull/64) updated dependencies and cleaned up crate metadata.
 
 ## [0.15.0] - 2021-11-16
-* In-memory compression of frames to use up less RAM.
+### Changed
+- In-memory compression of frames to use up less RAM.
 
 ## [0.14.0] - 2021-11-12
-* Add slider for controlling number of frames recorded.
-* Show total frames recorded and their total size.
-* Lower the default number of recorded frames to 600.
-* Add checkbox to toggle the profiling scopes.
+### Added
+- Add slider for controlling number of frames recorded.
+- Show total frames recorded and their total size.
+- Add checkbox to toggle the profiling scopes.
+
+### Changed
+- Lower the default number of recorded frames to 600.
 
 ## [0.13.4] - 2021-11-05
-* Normalize frame height based on what frames are visible.
+### Fixed
+- Normalize frame height based on what frames are visible.
 
 ## [0.13.3] - 2021-11-02
-* Fix occasional flickering when viewing merged scopes.
+### Fixed
+- Fix occasional flickering when viewing merged scopes.
 
 ## [0.13.2] - 2021-10-28
-* Add `ProfilerUi::global_frame_view` to access the profiler data.
+### Added
+- Add `ProfilerUi::global_frame_view` to access the profiler data.
 
 ## [0.13.1] - 2021-10-21
-* Add a scope filter to focus on certain scopes.
+### Added
+- Add a scope filter to focus on certain scopes.
 
 ## [0.13.0] - 2021-10-12
-* Nothing new
+### Fixed
+- Nothing new
 
 ## [0.12.0] - 2021-09-20
-* Update to imgui 0.8.0
+### Changed
+- Update to imgui 0.8.0
 
 ## [0.11.0] - 2021-09-06
-* Update puffin
+### Changed
+- Update puffin
 
 ## [0.10.0] - 2021-08-23
-* Fix "Toggle with spacebar." tooltip always showing.
-* Show frame index.
+### Changed
+- Show frame index.
+
+### Fixed
+- Fix "Toggle with spacebar." tooltip always showing.
 
 ## [0.9.0]
-* Paint flamegraph top-down
-* Scrollable flamegraph
-* Option to sort threads by name
-* Drag with right mouse button to zoom
-* Toggle play/pause with spacebar
-* More compact UI
-* Show all scopes (even tiny ones)
+### Changed
+- Paint flamegraph top-down
+- Scrollable flamegraph
+- More compact UI
+
+### Added
+- Option to sort threads by name
+- Drag with right mouse button to zoom
+- Toggle play/pause with spacebar
+- Show all scopes (even tiny ones)
 
 ## [0.8.0]
-* Select frames from recent history or from among the slowest ever.
-* Nicer colors.
-* Simpler interaction (drag to pan, scroll to zoom, click to focus, double-click to reset).
+### Added
+- Select frames from recent history or from among the slowest ever.
+- Nicer colors.
+- Simpler interaction (drag to pan, scroll to zoom, click to focus, double-click to reset).
 
 <!-- next-url -->
 [Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.15.0...HEAD
diff --git a/puffin_egui/CHANGELOG.md b/puffin_egui/CHANGELOG.md
index 1e6f0cc7..7027684e 100644
--- a/puffin_egui/CHANGELOG.md
+++ b/puffin_egui/CHANGELOG.md
@@ -6,100 +6,102 @@ All notable changes to the egui crate will be documented in this file.
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#64](https://github.com/EmbarkStudios/puffin/pull/64) updated dependencies and cleaned up crate metadata.
 
 ## [0.12.0] - 2022-01-11
 ### Changed
-* Update to `egui` 0.16.
+- Update to `egui` 0.16.
 
 ### Fixed
-* Fix compilation for `wasm32-unknown-unknown`.
+- Fix compilation for `wasm32-unknown-unknown`.
 
 ## [0.11.0] - 2021-11-16
 ### Added
-* Show total frames recorded and their total size.
-* Add slider to control how many recent frames to store.
+- Show total frames recorded and their total size.
+- Add slider to control how many recent frames to store.
 
 ### Fixed
-* In-memory compression of frames to use up less RAM.
+- In-memory compression of frames to use up less RAM.
 
 ## [0.10.3] - 2021-11-08
 ### Fixed
-* Fix vertical scrolling in flamgraph.
+- Fix vertical scrolling in flamgraph.
 
 ### Added
-* Show thread names in stats tab.
+- Show thread names in stats tab.
 
 ## [0.10.2] - 2021-11-05
 ### Fixed
-* Normalize frame height based on what frames are visible.
+- Normalize frame height based on what frames are visible.
 
 ## [0.10.1] - 2021-11-02
 ### Added
-* Show scrollbar for history of recent frames.
-* Show date-time of when a frame was recorded.
-* Show compressed size of selected frame.
+- Show scrollbar for history of recent frames.
+- Show date-time of when a frame was recorded.
+- Show compressed size of selected frame.
 
 ### Fixed
-* Fix occasional flickering when viewing merged scopes.
-* Handle gaps in incoming frames.
+- Fix occasional flickering when viewing merged scopes.
+- Handle gaps in incoming frames.
 
 ## [0.10.0] - 2021-10-29
 ### Changed
-* Update to egui 0.15.
+- Update to egui 0.15.
 
 ## [0.9.1] - 2021-10-21
 ### Added
-* Add a scope filter to focus on certain scopes.
+- Add a scope filter to focus on certain scopes.
 
 ## [0.9.0] - 2021-10-12
 ### Added
-* You can now select multiple frames.
+- You can now select multiple frames.
 
 ## [0.8.0] - 2021-09-20
 ### Changed
-* `ProfilerUi` now takes by argument the profiling data to view. You may want to use `GlobalProfilerUi` instead.
+- `ProfilerUi` now takes by argument the profiling data to view. You may want to use `GlobalProfilerUi` instead.
 
 ## [0.7.0] - 2021-09-06
 ### Added
-* Add a stats panel for finding high-bandwidth scopes.
+- Add a stats panel for finding high-bandwidth scopes.
 
 ## [0.6.0] - 2021-08-25
 ### Changed
-* Update to egui 0.14
+- Update to egui 0.14
 
 ## [0.5.0] - 2021-08-23
 ### Changed
-* Show frame index.
+- Show frame index.
 
 ## [0.4.0] - 2021-07-05
 ### Changed
-* Update to egui 0.13
-* Paint flamegraph top-down
-* More compact UI
-* Show all scopes (even tiny ones)
+- Update to egui 0.13
+- Paint flamegraph top-down
+- More compact UI
+- Show all scopes (even tiny ones)
 
 ### Added
-* Scrollable flamegraph
-* Option to sort threads by name
-* Drag with right mouse button to zoom
-* Toggle play/pause with spacebar
+- Scrollable flamegraph
+- Option to sort threads by name
+- Drag with right mouse button to zoom
+- Toggle play/pause with spacebar
 
 ## [0.3.0] - 2021-05-27
 ### Added
-* History viewer.
+- History viewer.
 
 ### Changed
-* Update to puffin 0.5.1.
+- Update to puffin 0.5.1.
 
 ## [0.2.0] - 2021-05-13
 ### Changed
-* Update to egui 0.12.
-* Remove drag-to-zoom (scroll to zoom instead).
+- Update to egui 0.12.
+- Remove drag-to-zoom (scroll to zoom instead).
 
 ## [0.1.0] - 2021-05-05
 ### Added
-* Show flamegraph plot of either latest frame, a spike frame, or a paused frame.
-* The view supports viewing merged sibling scopes.
+- Show flamegraph plot of either latest frame, a spike frame, or a paused frame.
+- The view supports viewing merged sibling scopes.
 
 <!-- next-url -->
 [Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.12.0...HEAD
diff --git a/puffin_http/CHANGELOG.md b/puffin_http/CHANGELOG.md
index d49f21fe..aaa1085e 100644
--- a/puffin_http/CHANGELOG.md
+++ b/puffin_http/CHANGELOG.md
@@ -6,51 +6,53 @@ All notable changes to `puffin_http` will be documented in this file.
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#64](https://github.com/EmbarkStudios/puffin/pull/64) updated dependencies and cleaned up crate metadata.
 
 ## [0.9.0] - 2021-11-16
 ### Changed
-* In-memory compression of frames to use up less RAM.
+- In-memory compression of frames to use up less RAM.
 
 ## [0.8.0] - 2021-11-12
 ### Changed
-* Update to puffin 0.11.0.
+- Update to puffin 0.11.0.
 
 ## [0.7.3] - 2021-11-08
 ### Added
-* Add `Server::num_clients`.
+- Add `Server::num_clients`.
 
 ## [0.7.2] - 2021-10-28
 ### Fixed
-* Send all outstanding frames on shutdown.
+- Send all outstanding frames on shutdown.
 
 ## [0.7.0] - 2021-10-12
 ### Fixed
-* Nothing new.
+- Nothing new.
 
 ## [0.6.0] - 2021-09-20
 ### Changed
-* Better handle slow clients, especially when there are multiple clients.
+- Better handle slow clients, especially when there are multiple clients.
 
 ## [0.5.1] - 2021-09-16
 ### Fixed
-* Fix high-bandwidth connection interruptions.
+- Fix high-bandwidth connection interruptions.
 
 ## [0.5.0] - 2021-09-06
 ### Changed
-* Switch from lz4 to zstd compression for 50% file size and bandwidth reduction.
+- Switch from lz4 to zstd compression for 50% file size and bandwidth reduction.
 
 ## [0.4.1] - 2021-08-24
 ### Fixed
-* Do less work when no clients are connected.
+- Do less work when no clients are connected.
 
 ## [0.4.0] - 2021-08-23
 ### Changed
-* Remove `Server::update` (no longer needed).
-* Compress the TCP stream (approximately 75% bandwidth reduction).
+- Remove `Server::update` (no longer needed).
+- Compress the TCP stream (approximately 75% bandwidth reduction).
 
 ## [0.3.0]
 ### Added
-* Initial release
+- Initial release
 
 <!-- next-url -->
 [Unreleased]: https://github.com/EmbarkStudios/puffin/compare/0.9.0...HEAD
diff --git a/puffin_viewer/CHANGELOG.md b/puffin_viewer/CHANGELOG.md
index e300bc5b..aef6b2fd 100644
--- a/puffin_viewer/CHANGELOG.md
+++ b/puffin_viewer/CHANGELOG.md
@@ -6,62 +6,64 @@ All notable changes to `puffin_viewer` will be documented in this file.
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Changed
+- [PR#64](https://github.com/EmbarkStudios/puffin/pull/64) updated dependencies and cleaned up crate metadata.
 
 ## [0.10.1] - 2022-01-11
 ### Changed
-* Update to latest `eframe` and `winit`
-* Swich renderer from `egui_glium` to `egui_glow`.
+- Update to latest `eframe` and `winit`
+- Swich renderer from `egui_glium` to `egui_glow`.
 
 ## [0.10.0] - 2021-11-16
 ### Changed
-* In-memory compression of frames to use up less RAM.
+- In-memory compression of frames to use up less RAM.
 
 ### Added
-* Add slider to control how many recent frames to store.
-* Add ability to profile `puffin_viewer` from itself.
+- Add slider to control how many recent frames to store.
+- Add ability to profile `puffin_viewer` from itself.
 
 ## [0.9.2] - 2021-11-08
 ### Fixed
-* Fix vertical scrolling in flamgraph
+- Fix vertical scrolling in flamgraph
 
 ## [0.9.1] - 2021-11-05
 ### Fixed
-* Normalize frame height based on what frames are visible.
+- Normalize frame height based on what frames are visible.
 
 ## [0.9.0] - 2021-11-02
 ### Changed
-* Use [`egui_glow`](https://github.com/emilk/egui/tree/master/egui_glow) backend (slightly experimental, but compiles and runs faster).
+- Use [`egui_glow`](https://github.com/emilk/egui/tree/master/egui_glow) backend (slightly experimental, but compiles and runs faster).
 
 ## [0.8.0] - 2021-10-29
 ### Changed
-* Change `--file` option to instead be a positional argument.
+- Change `--file` option to instead be a positional argument.
 
 ## [0.7.1] - 2021-10-21
 ### Added
-* Add a scope filter to focus on certain scopes.
+- Add a scope filter to focus on certain scopes.
 
 ## [0.7.0] - 2021-10-12
 ### Added
-* You can now select multiple frames.
+- You can now select multiple frames.
 
 ## [0.6.1] - 2021-09-08
 ### Fixed
-* Fix deadlock when saving a file.
+- Fix deadlock when saving a file.
 
 ## [0.6.0] - 2021-09-06
 ### Changed
-* Better compressed network stream and files (50% smaller).
+- Better compressed network stream and files (50% smaller).
 
 ### Added
-* Added stats view to find unnecessary scopes.
+- Added stats view to find unnecessary scopes.
 
 ## [0.5.0]
 ### Added
-* Load and save recordings as `.puffin` files.
+- Load and save recordings as `.puffin` files.
 
 ## [0.4.0]
 ### Added
-* Add support for compressed TCP stream (up to 75% bandwidth reduction).
+- Add support for compressed TCP stream (up to 75% bandwidth reduction).
 
 ## [0.3.0]
 ### Added

From 1ebb11ee5e0fa18f5fb0dc9c55e5ec2d820b2801 Mon Sep 17 00:00:00 2001
From: Jake Shadle <jake.shadle@embark-studios.com>
Date: Mon, 7 Feb 2022 10:52:56 +0100
Subject: [PATCH 12/12] Fix lints

---
 puffin/src/frame_data.rs  |  1 +
 puffin_viewer/src/lib.rs  |  2 ++
 puffin_viewer/src/main.rs | 48 +++++++++++++++++++++------------------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/puffin/src/frame_data.rs b/puffin/src/frame_data.rs
index 4252426d..7b0f5218 100644
--- a/puffin/src/frame_data.rs
+++ b/puffin/src/frame_data.rs
@@ -274,6 +274,7 @@ impl FrameData {
     }
 
     #[cfg(target_arch = "wasm32")]
+    #[allow(clippy::unused_self)]
     pub fn pack(&self) {
         // compression not supported on wasm, so this is a no-op
     }
diff --git a/puffin_viewer/src/lib.rs b/puffin_viewer/src/lib.rs
index b0534c29..6c6bd011 100644
--- a/puffin_viewer/src/lib.rs
+++ b/puffin_viewer/src/lib.rs
@@ -82,6 +82,7 @@
 // END - Embark standard lints v0.5 for Rust 1.55+
 // crate-specific exceptions:
 #![allow(clippy::exit)]
+#![cfg_attr(target_arch = "wasm32", allow(clippy::unused_unit))]
 
 use eframe::{egui, epi};
 use puffin::FrameView;
@@ -342,6 +343,7 @@ use eframe::wasm_bindgen::{self, prelude::*};
 /// It loads the app, installs some callbacks, then returns.
 /// You can add more callbacks like this if you want to call in to your code.
 #[cfg(target_arch = "wasm32")]
+#[allow(clippy::unused_unit)]
 #[wasm_bindgen]
 pub fn start(canvas_id: &str) -> Result<(), eframe::wasm_bindgen::JsValue> {
     puffin::set_scopes_on(true); // quiet warning in `puffin_egui`.
diff --git a/puffin_viewer/src/main.rs b/puffin_viewer/src/main.rs
index 3d5f6603..d1d7c539 100644
--- a/puffin_viewer/src/main.rs
+++ b/puffin_viewer/src/main.rs
@@ -1,28 +1,29 @@
 //! Remote puffin viewer, connecting to a [`puffin_http::PuffinServer`].
 
-use puffin::FrameView;
-use puffin_viewer::{PuffinViewer, Source};
-
-/// puffin profile viewer.
-///
-/// Can either connect remotely to a puffin server
-/// or open a .puffin recording file.
-#[derive(argh::FromArgs)]
-struct Arguments {
-    /// which server to connect to, e.g. `127.0.0.1:8585`.
-    #[argh(option, default = "default_url()")]
-    url: String,
-
-    /// what .puffin file to open, e.g. `my/recording.puffin`.
-    #[argh(positional)]
-    file: Option<String>,
-}
-
-fn default_url() -> String {
-    format!("127.0.0.1:{}", puffin_http::DEFAULT_PORT)
-}
-
+#[cfg(not(target_arch = "wasm32"))]
 fn main() {
+    /// puffin profile viewer.
+    ///
+    /// Can either connect remotely to a puffin server
+    /// or open a .puffin recording file.
+    #[derive(argh::FromArgs)]
+    struct Arguments {
+        /// which server to connect to, e.g. `127.0.0.1:8585`.
+        #[argh(option, default = "default_url()")]
+        url: String,
+
+        /// what .puffin file to open, e.g. `my/recording.puffin`.
+        #[argh(positional)]
+        file: Option<String>,
+    }
+
+    fn default_url() -> String {
+        format!("127.0.0.1:{}", puffin_http::DEFAULT_PORT)
+    }
+
+    use puffin::FrameView;
+    use puffin_viewer::{PuffinViewer, Source};
+
     let opt: Arguments = argh::from_env();
 
     simple_logger::SimpleLogger::new()
@@ -52,3 +53,6 @@ fn main() {
     };
     eframe::run_native(Box::new(app), options);
 }
+
+#[cfg(target_arch = "wasm32")]
+fn main() {}