Skip to content

Commit

Permalink
Bug 1873164 - Update wgpu to revision 4b82121501a61c2c2e11cb472d70b…
Browse files Browse the repository at this point in the history
…a54af3aa12d. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler

Changelog

 * #4927 BGL Weak Pointer Deduplication Pool
   By cwfitzgerald in gfx-rs/wgpu#4927
 * #4958 Change examples page menu on smaller screens
   By Dinnerbone in gfx-rs/wgpu#4958
 * #4950 Bump anyhow from 1.0.77 to 1.0.78
   By dependabot[bot] in gfx-rs/wgpu#4950
 * #4957 Disable Linux Tests
   By cwfitzgerald in gfx-rs/wgpu#4957
 * #4960 Fix incorrect ConfigureSurfaceError::TooLarge message
   By Dinnerbone in gfx-rs/wgpu#4960
 * #4935 Add `cfg_aliases` to `wgpu`
   By daxpedda in gfx-rs/wgpu#4935
 * #4939 hello_compute: check for missing command-line args
   By vilcans in gfx-rs/wgpu#4939
 * #4948 Bump winit from 0.29.6 to 0.29.8
   By dependabot[bot] in gfx-rs/wgpu#4948
 * #4944 Fix xtask wasm-bindgen install
   By rukai in gfx-rs/wgpu#4944
 * #4858 [glsl-in] fix swizzle in global const context
   By teoxoy in gfx-rs/wgpu#4858
 * #4968 [gl] fix RGBA8 format capabilities
   By teoxoy in gfx-rs/wgpu#4968
 * #4947 Avoid allocating during queue submit
   By udoprog in gfx-rs/wgpu#4947
 * #4965 Bump serde from 1.0.193 to 1.0.194
   By dependabot[bot] in gfx-rs/wgpu#4965
 * #4975 Fix Hang in Multithreaded Compute Test
   By cwfitzgerald in gfx-rs/wgpu#4975
 * #4966 Bump anyhow from 1.0.78 to 1.0.79
   By dependabot[bot] in gfx-rs/wgpu#4966
 * #4978 Bump thiserror from 1.0.52 to 1.0.56
   By dependabot[bot] in gfx-rs/wgpu#4978
 * #4979 Bump syn from 2.0.46 to 2.0.47
   By dependabot[bot] in gfx-rs/wgpu#4979
 * #4977 Use Custom Mesa for Building
   By cwfitzgerald in gfx-rs/wgpu#4977
 * #4981 Bump serde_json from 1.0.108 to 1.0.110
   By dependabot[bot] in gfx-rs/wgpu#4981
 * #4959 wgpu-hal: Fix Mesa version check for version with suffix containing `.`
   By ids1024 in gfx-rs/wgpu#4959
 * #4976 Shorten Lock Lifetimes
   By cwfitzgerald in gfx-rs/wgpu#4976
 * #4980 Pin DXC and Vulkan SDK version
   By cwfitzgerald in gfx-rs/wgpu#4980
 * #4974 gles: use already existing debug__fn private capabilty instead of checking extensions
   By valaphee in gfx-rs/wgpu#4974
 * #4987 Remove Mac CI
   By cwfitzgerald in gfx-rs/wgpu#4987
 * #4990 Fix Queue::write_texture, Fix DX12 write_texture_subset_2d and re-enable the test.
   By dtzxporter in gfx-rs/wgpu#4990
 * #4994 Bump syn from 2.0.47 to 2.0.48
   By dependabot[bot] in gfx-rs/wgpu#4994
 * #4993 Bump serde_json from 1.0.110 to 1.0.111
   By dependabot[bot] in gfx-rs/wgpu#4993
 * #4992 Bump gpu-allocator from 0.24.0 to 0.25.0
   By dependabot[bot] in gfx-rs/wgpu#4992
 * #4995 Add Verbosity Flags to wgpu-info
   By cwfitzgerald in gfx-rs/wgpu#4995
 * #4996 Dependency Update Rollup
   By cwfitzgerald in gfx-rs/wgpu#4996
 * #4954 Put raw texture access behind snatch guards
   By nical in gfx-rs/wgpu#4954
 * #4954 Put raw texture access behind snatch guards
   By nical in gfx-rs/wgpu#4954
 * #4969 Texture snatching
   By nical in gfx-rs/wgpu#4969
 * #4969 Texture snatching
   By nical in gfx-rs/wgpu#4969

Differential Revision: https://phabricator.services.mozilla.com/D197786
  • Loading branch information
nical committed Jan 5, 2024
1 parent 915014c commit ff86798
Show file tree
Hide file tree
Showing 60 changed files with 2,779 additions and 2,352 deletions.
4 changes: 2 additions & 2 deletions .cargo/config.in
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ git = "https://github.com/franziskuskiefer/cose-rust"
rev = "43c22248d136c8b38fe42ea709d08da6355cf04b"
replace-with = "vendored-sources"

[source."git+https://github.com/gfx-rs/wgpu?rev=46757372cc02d6608124502104a0c225e1744fd7"]
[source."git+https://github.com/gfx-rs/wgpu?rev=4b82121501a61c2c2e11cb472d70ba54af3aa12d"]
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
replace-with = "vendored-sources"

[source."git+https://github.com/hsivonen/chardetng?rev=3484d3e3ebdc8931493aa5df4d7ee9360a90e76b"]
Expand Down
27 changes: 14 additions & 13 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions gfx/wgpu_bindings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ default = []
[dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
#Note: "replay" shouldn't ideally be needed,
# but it allows us to serialize everything across IPC.
features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl", "api_log_info"]
Expand All @@ -27,36 +27,36 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl", "api_log
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
features = ["metal"]

# We want the wgpu-core Direct3D backends on Windows.
[target.'cfg(windows)'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
features = ["dx12"]

# We want the wgpu-core Vulkan backend on Linux and Windows.
[target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"
features = ["vulkan"]

[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"

[dependencies.wgh]
package = "wgpu-hal"
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"

[target.'cfg(windows)'.dependencies.d3d12]
git = "https://github.com/gfx-rs/wgpu"
rev = "46757372cc02d6608124502104a0c225e1744fd7"
rev = "4b82121501a61c2c2e11cb472d70ba54af3aa12d"

[target.'cfg(windows)'.dependencies]
winapi = "0.3"
Expand Down
4 changes: 2 additions & 2 deletions gfx/wgpu_bindings/moz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ origin:

# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: commit 46757372cc02d6608124502104a0c225e1744fd7
release: commit 4b82121501a61c2c2e11cb472d70ba54af3aa12d

# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: 46757372cc02d6608124502104a0c225e1744fd7
revision: 4b82121501a61c2c2e11cb472d70ba54af3aa12d

license: ['MIT', 'Apache-2.0']

Expand Down
15 changes: 10 additions & 5 deletions supply-chain/audits.toml
Original file line number Diff line number Diff line change
Expand Up @@ -1269,7 +1269,7 @@ who = [
"Nicolas Silva <nical@fastmail.com>",
]
criteria = "safe-to-deploy"
delta = "0.7.0 -> 0.7.0@git:46757372cc02d6608124502104a0c225e1744fd7"
delta = "0.7.0 -> 0.7.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
importable = false

[[audits.darling]]
Expand Down Expand Up @@ -2541,7 +2541,7 @@ delta = "0.13.0 -> 0.14.0"
[[audits.naga]]
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
criteria = "safe-to-deploy"
delta = "0.14.0 -> 0.14.2@git:46757372cc02d6608124502104a0c225e1744fd7"
delta = "0.14.0 -> 0.14.2@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
importable = false

[[audits.net2]]
Expand Down Expand Up @@ -3519,6 +3519,11 @@ who = "Mike Hommey <mh+mozilla@glandium.org>"
criteria = "safe-to-deploy"
delta = "0.4.4 -> 0.4.7"

[[audits.spirv]]
who = "Nicolas Silva <nical@fastmail.com>"
criteria = "safe-to-deploy"
delta = "0.2.0+1.5.4 -> 0.3.0+sdk-1.3.268.0"

[[audits.strck]]
who = "Makoto Kato <m_kato@ga2.so-net.ne.jp>"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -4308,7 +4313,7 @@ delta = "0.17.0 -> 0.18.0"
[[audits.wgpu-core]]
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
criteria = "safe-to-deploy"
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
importable = false

[[audits.wgpu-hal]]
Expand Down Expand Up @@ -4357,7 +4362,7 @@ delta = "0.17.0 -> 0.18.0"
[[audits.wgpu-hal]]
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
criteria = "safe-to-deploy"
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
importable = false

[[audits.wgpu-types]]
Expand Down Expand Up @@ -4406,7 +4411,7 @@ delta = "0.17.0 -> 0.18.0"
[[audits.wgpu-types]]
who = ["Jim Blandy <jimb@red-bean.com>", "Nicolas Silva <nical@fastmail.com>"]
criteria = "safe-to-deploy"
delta = "0.18.0 -> 0.18.0@git:46757372cc02d6608124502104a0c225e1744fd7"
delta = "0.18.0 -> 0.18.0@git:4b82121501a61c2c2e11cb472d70ba54af3aa12d"
importable = false

[[audits.whatsys]]
Expand Down
14 changes: 14 additions & 0 deletions supply-chain/imports.lock
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde]]
version = "1.0.194"
when = "2024-01-02"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_bytes]]
version = "0.11.9"
when = "2023-02-05"
Expand Down Expand Up @@ -573,6 +580,13 @@ user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_derive]]
version = "1.0.194"
when = "2024-01-02"
user-id = 3618
user-login = "dtolnay"
user-name = "David Tolnay"

[[publisher.serde_json]]
version = "1.0.93"
when = "2023-02-08"
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/naga/.cargo-checksum.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions third_party/rust/naga/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ bitflags = "2.2"
log = "0.4"
num-traits = "0.2"
rustc-hash = "1.1.0"
thiserror = "1.0.52"
thiserror = "1.0.56"

[dependencies.arbitrary]
version = "1.3"
Expand All @@ -78,12 +78,12 @@ version = "0.2.1"
optional = true

[dependencies.serde]
version = "1.0.193"
version = "1.0.194"
features = ["derive"]
optional = true

[dependencies.spirv]
version = "0.2"
version = "0.3"
optional = true

[dependencies.termcolor]
Expand Down Expand Up @@ -113,7 +113,7 @@ version = "1.0"
features = ["derive"]

[dev-dependencies.spirv]
version = "0.2"
version = "0.3"
features = ["deserialize"]

[features]
Expand Down
6 changes: 5 additions & 1 deletion third_party/rust/naga/src/front/glsl/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,11 @@ impl Index<Handle<Expression>> for Context<'_> {
type Output = Expression;

fn index(&self, index: Handle<Expression>) -> &Self::Output {
&self.expressions[index]
if self.is_const {
&self.module.const_expressions[index]
} else {
&self.expressions[index]
}
}
}

Expand Down
1 change: 0 additions & 1 deletion third_party/rust/naga/src/front/spv/convert.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use super::error::Error;
use num_traits::cast::FromPrimitive;
use std::convert::TryInto;

pub(super) const fn map_binary_operator(word: spirv::Op) -> Result<crate::BinaryOperator, Error> {
Expand Down
3 changes: 1 addition & 2 deletions third_party/rust/naga/src/front/spv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ use crate::{
FastHashMap, FastHashSet, FastIndexMap,
};

use num_traits::cast::FromPrimitive;
use petgraph::graphmap::GraphMap;
use std::{convert::TryInto, mem, num::NonZeroU32, path::PathBuf};

Expand Down Expand Up @@ -661,7 +660,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
if wc == 0 {
return Err(Error::InvalidWordCount);
}
let op = spirv::Op::from_u16(opcode).ok_or(Error::UnknownInstruction(opcode))?;
let op = spirv::Op::from_u32(opcode as u32).ok_or(Error::UnknownInstruction(opcode))?;

Ok(Instruction { op, wc })
}
Expand Down
2 changes: 1 addition & 1 deletion third_party/rust/serde/.cargo-checksum.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"files":{"Cargo.toml":"931117d542e190ad20b9c984a357c900c39fe8d59df2c229b6e3a711622a98c8","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"c3ece10a36d19b4e857a770eaf74a2164d220f55fa11947065a3898c1697ecef","build.rs":"f9ba30324b9ce085c903595fb55a5293f8c2348ff36bfe870521b935ae6d105c","crates-io.md":"56e988ac4944c45f5bf5051e3827892ed8fb817853d99d9df1fff6621108e270","src/de/format.rs":"c85071b016df643b161859682d21ce34fa0ebf2a3bdbeeea69859da48f5d934f","src/de/ignored_any.rs":"6480f2b2a83dc4764d01b2eec7309729eef2492eede2e5ee98d23a60b05198eb","src/de/impls.rs":"2857d734176a0b78a41c9358354b0b0b83c6b2d948590be072d98606a8cae9d6","src/de/mod.rs":"07cbf58cc8f45d8009558adfed7f7340ea68ad9296bb79d7c4a872ae1a635d09","src/de/seed.rs":"045d890712a04eb33ffc5a021e5d948a63c89402b8ffeea749df2171b7484f8f","src/de/size_hint.rs":"fff83dc39d30e75e8e611991f9c5399188a1aad23a6462dbca2c8b62655cfedb","src/de/value.rs":"5d8dcae3a98a2203f2c0934adb84dbf741f120f246dfc02aa6d0d10673dc39c7","src/integer128.rs":"29ef30b7d94507b34807090e68173767cdc7aff62edccd38affe69e75338dddc","src/lib.rs":"45e8ba8590fc9e78a7bd0bbfac14cdb1eeea5cb16f920997e0efc10e0b55e540","src/macros.rs":"e3486ef4a9a4ed1b27234aa1817ccb25ec0eb026ffc95e2c71c7b917f1f45629","src/private/de.rs":"6557a124fdaf61f9c7cd80163e40f4a453354e45b63a4eb55dafdfe0159f6881","src/private/doc.rs":"9ad740e9ea2eedf861b77116eda9a6fb74bc8553541cd17d1bc5791a3ef3271a","src/private/mod.rs":"b8f0c348621d91dd9da3db83d8877e70bc61ad0a2dc2d6fb57c6fc2c2cbafa26","src/private/ser.rs":"656613691bd8d40cb70a52d4ebe3ee96a993c8a1292d50822d9ca5bdad84426b","src/ser/fmt.rs":"77a5583e5c227ea1982b097ed6378af5c899d43761d71e33440262fd35944695","src/ser/impls.rs":"850619164b399c37cd373d24f5a2c83453f40b34bb978c5722d2c1ae226775b5","src/ser/impossible.rs":"e11b37689ec1395378d546fce74221ca9046d0761744301f12029102fd07e30e","src/ser/mod.rs":"e95dabf07216136440d6a2822cf37775f583d141c21d1b37ec9c55ae2a5024ab","src/std_error.rs":"25a07149e2e468747ffa5a58051c7f93d7b3c0fa0372f012a96c97ec8ab03b97"},"package":"25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"}
{"files":{"Cargo.toml":"1823c76d8cb6a803a6f29bb748445814da9249561e17c21827c5ca061460f5f2","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"c3ece10a36d19b4e857a770eaf74a2164d220f55fa11947065a3898c1697ecef","build.rs":"f9ba30324b9ce085c903595fb55a5293f8c2348ff36bfe870521b935ae6d105c","crates-io.md":"56e988ac4944c45f5bf5051e3827892ed8fb817853d99d9df1fff6621108e270","src/de/format.rs":"c85071b016df643b161859682d21ce34fa0ebf2a3bdbeeea69859da48f5d934f","src/de/ignored_any.rs":"6480f2b2a83dc4764d01b2eec7309729eef2492eede2e5ee98d23a60b05198eb","src/de/impls.rs":"2857d734176a0b78a41c9358354b0b0b83c6b2d948590be072d98606a8cae9d6","src/de/mod.rs":"7fb7427de1981bfa13af06c898d213a6bc34697148e96cef08d3c447c1999527","src/de/seed.rs":"045d890712a04eb33ffc5a021e5d948a63c89402b8ffeea749df2171b7484f8f","src/de/size_hint.rs":"fff83dc39d30e75e8e611991f9c5399188a1aad23a6462dbca2c8b62655cfedb","src/de/value.rs":"5d8dcae3a98a2203f2c0934adb84dbf741f120f246dfc02aa6d0d10673dc39c7","src/integer128.rs":"29ef30b7d94507b34807090e68173767cdc7aff62edccd38affe69e75338dddc","src/lib.rs":"84c4afda21e66fc28152099bcf182092fe8df409ba510296c66a54987bb4a107","src/macros.rs":"e3486ef4a9a4ed1b27234aa1817ccb25ec0eb026ffc95e2c71c7b917f1f45629","src/private/de.rs":"6557a124fdaf61f9c7cd80163e40f4a453354e45b63a4eb55dafdfe0159f6881","src/private/doc.rs":"9ad740e9ea2eedf861b77116eda9a6fb74bc8553541cd17d1bc5791a3ef3271a","src/private/mod.rs":"b8f0c348621d91dd9da3db83d8877e70bc61ad0a2dc2d6fb57c6fc2c2cbafa26","src/private/ser.rs":"656613691bd8d40cb70a52d4ebe3ee96a993c8a1292d50822d9ca5bdad84426b","src/ser/fmt.rs":"77a5583e5c227ea1982b097ed6378af5c899d43761d71e33440262fd35944695","src/ser/impls.rs":"850619164b399c37cd373d24f5a2c83453f40b34bb978c5722d2c1ae226775b5","src/ser/impossible.rs":"e11b37689ec1395378d546fce74221ca9046d0761744301f12029102fd07e30e","src/ser/mod.rs":"a7fd082203d63cbe4f0fe86d9be16bf4f3b2444653dac6bb61d82e0f4f6b4214","src/std_error.rs":"25a07149e2e468747ffa5a58051c7f93d7b3c0fa0372f012a96c97ec8ab03b97"},"package":"0b114498256798c94a0689e1a15fec6005dee8ac1f41de56404b67afc2a4b773"}
4 changes: 2 additions & 2 deletions third_party/rust/serde/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
edition = "2018"
rust-version = "1.31"
name = "serde"
version = "1.0.193"
version = "1.0.194"
authors = [
"Erick Tryzelaar <erick.tryzelaar@gmail.com>",
"David Tolnay <dtolnay@gmail.com>",
Expand Down Expand Up @@ -74,4 +74,4 @@ std = []
unstable = []

[target."cfg(any())".dependencies.serde_derive]
version = "=1.0.193"
version = "=1.0.194"
4 changes: 2 additions & 2 deletions third_party/rust/serde/src/de/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
//! - RefCell\<T\>
//! - Mutex\<T\>
//! - RwLock\<T\>
//! - Rc\<T\>&emsp;*(if* features = ["rc"] *is enabled)*
//! - Arc\<T\>&emsp;*(if* features = ["rc"] *is enabled)*
//! - Rc\<T\>&emsp;*(if* features = \["rc"\] *is enabled)*
//! - Arc\<T\>&emsp;*(if* features = \["rc"\] *is enabled)*
//! - **Collection types**:
//! - BTreeMap\<K, V\>
//! - BTreeSet\<T\>
Expand Down
3 changes: 1 addition & 2 deletions third_party/rust/serde/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
////////////////////////////////////////////////////////////////////////////////

// Serde types in rustdoc of other crates get linked to here.
#![doc(html_root_url = "https://docs.rs/serde/1.0.193")]
#![doc(html_root_url = "https://docs.rs/serde/1.0.194")]
// Support using Serde without the standard library!
#![cfg_attr(not(feature = "std"), no_std)]
// Show which crate feature enables conditionally compiled APIs in documentation.
Expand All @@ -122,7 +122,6 @@
// things are often more readable this way
clippy::cast_lossless,
clippy::module_name_repetitions,
clippy::option_if_let_else,
clippy::single_match_else,
clippy::type_complexity,
clippy::use_self,
Expand Down
4 changes: 2 additions & 2 deletions third_party/rust/serde/src/ser/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
//! - RefCell\<T\>
//! - Mutex\<T\>
//! - RwLock\<T\>
//! - Rc\<T\>&emsp;*(if* features = ["rc"] *is enabled)*
//! - Arc\<T\>&emsp;*(if* features = ["rc"] *is enabled)*
//! - Rc\<T\>&emsp;*(if* features = \["rc"\] *is enabled)*
//! - Arc\<T\>&emsp;*(if* features = \["rc"\] *is enabled)*
//! - **Collection types**:
//! - BTreeMap\<K, V\>
//! - BTreeSet\<T\>
Expand Down
Loading

0 comments on commit ff86798

Please sign in to comment.