From 9a451c6a20589f377fd5460e242e6b38882f3ae6 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 15 Jun 2021 21:24:48 +0000 Subject: [PATCH] Bug 1716518 - Upgrade inherent to v0.1.6. r=emilio Differential Revision: https://phabricator.services.mozilla.com/D117802 --- Cargo.lock | 4 ++-- third_party/rust/inherent/.cargo-checksum.json | 2 +- third_party/rust/inherent/Cargo.toml | 2 +- third_party/rust/inherent/src/expand.rs | 7 ++++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d33915fd2ad1..8eecbd3de5b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2439,9 +2439,9 @@ dependencies = [ [[package]] name = "inherent" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a1325a022293a53274277a7c5c3c5bc73405cb443bb96cc2ce20ff4121e995" +checksum = "f3974bf42c2050bbf0696471e4d91ecc9844845c2323b388aa7bf9d63f3b0693" dependencies = [ "proc-macro2", "quote", diff --git a/third_party/rust/inherent/.cargo-checksum.json b/third_party/rust/inherent/.cargo-checksum.json index 954034d6b210..676dc87e2cf0 100644 --- a/third_party/rust/inherent/.cargo-checksum.json +++ b/third_party/rust/inherent/.cargo-checksum.json @@ -1 +1 @@ -{"files":{"Cargo.toml":"bd0547397529da2c04320940fecc8ffff6aaaf6b4e1e1ee33153d873b895ad6b","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"74bd3fad47365c6947c8026d71c4447503eadc4e59cab5b99008758764ca8163","src/default_methods.rs":"71d2d0e6a54f30b5958ecaa48b49fd21560620f98e468a99142bea1d954b36a4","src/expand.rs":"163ad57ac8e5cb2294d96a2ba8db23815c44137e23f8177bfd59f87a4cd3d694","src/lib.rs":"6e844f4e0104c942945e8071b346788f01f5e63e15d378b501b966d10d49f8ed","src/parse.rs":"5478cff1e20ac6dc2c95772eaecfa8b8ec557effe689b536d865287c0b0b89ce","src/visibility.rs":"d5334b8db4953bd7aa9277e75717f2bdaf4ceb01e98db101d040687238f22e20","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"5ba0edc93c0edf63744d45cd293ed8c522ee3a7cb9da3df4d7dacaa6ed004478","tests/ui/default-with-body.rs":"d7a6ad44e8327f298b88e93b43adb019d4278ccd2f56f0ca98c819d08bf8906a","tests/ui/default-with-body.stderr":"e3669c86597c7146dba36f3dfa6a200fd66e315b9e5518171c1ec45c883e1e2d","tests/ui/nonsense-in-default.rs":"694f0e75e213ad78ad30124f00bb45517331f2eceb8f44f4f49d5f5d917ba018","tests/ui/nonsense-in-default.stderr":"96d47e0b3b00197e6f959759a8c57a77d7af68ebfa8d0ed1d4df3f6fe0995717","tests/ui/not-trait-impl.rs":"e99aba255dc75c498d43098c496a2b349631de74ca51b6fdcd90fc744a4fcc94","tests/ui/not-trait-impl.stderr":"12e936203b335bccc3a180c66523c0d434fac6038521d1a6712ee5d37a7eec4d","tests/ui/not-visible.rs":"ee9c08bf412b0ce2b077ab53a2ad4c98ada104c48721b484bfe79ebb2bc36230","tests/ui/not-visible.stderr":"c8bf2a1efbe851a7b1eb1490ea621826f37670bf80d17090b0437140cc396995"},"package":"f3a1325a022293a53274277a7c5c3c5bc73405cb443bb96cc2ce20ff4121e995"} \ No newline at end of file +{"files":{"Cargo.toml":"828fa0100631dbaa0599b7528d8507a4455036d3394e71ebe09524d056f83c6c","LICENSE-APACHE":"a60eea817514531668d7e00765731449fe14d059d3249e0bc93b36de45f759f2","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"74bd3fad47365c6947c8026d71c4447503eadc4e59cab5b99008758764ca8163","src/default_methods.rs":"71d2d0e6a54f30b5958ecaa48b49fd21560620f98e468a99142bea1d954b36a4","src/expand.rs":"f8ebd17b948b00e71af3a6f9cf9be092867344e8caf33bae682c66ba1a03b9de","src/lib.rs":"6e844f4e0104c942945e8071b346788f01f5e63e15d378b501b966d10d49f8ed","src/parse.rs":"5478cff1e20ac6dc2c95772eaecfa8b8ec557effe689b536d865287c0b0b89ce","src/visibility.rs":"d5334b8db4953bd7aa9277e75717f2bdaf4ceb01e98db101d040687238f22e20","tests/compiletest.rs":"0a52a44786aea1c299c695bf948b2ed2081e4cc344e5c2cadceab4eb03d0010d","tests/test.rs":"5ba0edc93c0edf63744d45cd293ed8c522ee3a7cb9da3df4d7dacaa6ed004478","tests/ui/default-with-body.rs":"d7a6ad44e8327f298b88e93b43adb019d4278ccd2f56f0ca98c819d08bf8906a","tests/ui/default-with-body.stderr":"e3669c86597c7146dba36f3dfa6a200fd66e315b9e5518171c1ec45c883e1e2d","tests/ui/nonsense-in-default.rs":"694f0e75e213ad78ad30124f00bb45517331f2eceb8f44f4f49d5f5d917ba018","tests/ui/nonsense-in-default.stderr":"96d47e0b3b00197e6f959759a8c57a77d7af68ebfa8d0ed1d4df3f6fe0995717","tests/ui/not-trait-impl.rs":"e99aba255dc75c498d43098c496a2b349631de74ca51b6fdcd90fc744a4fcc94","tests/ui/not-trait-impl.stderr":"12e936203b335bccc3a180c66523c0d434fac6038521d1a6712ee5d37a7eec4d","tests/ui/not-visible.rs":"ee9c08bf412b0ce2b077ab53a2ad4c98ada104c48721b484bfe79ebb2bc36230","tests/ui/not-visible.stderr":"c8bf2a1efbe851a7b1eb1490ea621826f37670bf80d17090b0437140cc396995"},"package":"f3974bf42c2050bbf0696471e4d91ecc9844845c2323b388aa7bf9d63f3b0693"} \ No newline at end of file diff --git a/third_party/rust/inherent/Cargo.toml b/third_party/rust/inherent/Cargo.toml index d6a93be65328..ed48b15b70ff 100644 --- a/third_party/rust/inherent/Cargo.toml +++ b/third_party/rust/inherent/Cargo.toml @@ -13,7 +13,7 @@ [package] edition = "2018" name = "inherent" -version = "0.1.5" +version = "0.1.6" authors = ["David Tolnay "] description = "Make trait methods callable without the trait in scope" documentation = "https://docs.rs/inherent" diff --git a/third_party/rust/inherent/src/expand.rs b/third_party/rust/inherent/src/expand.rs index d959fa4a6044..05457bc3e6eb 100644 --- a/third_party/rust/inherent/src/expand.rs +++ b/third_party/rust/inherent/src/expand.rs @@ -47,7 +47,12 @@ pub fn inherent(vis: Visibility, mut input: TraitImpl) -> TokenStream { let default_doc = if has_doc { None } else { - let msg = format!("See [`{}::{}`]", quote!(#trait_), ident); + let mut link = String::new(); + for segment in &trait_.segments { + link += &segment.ident.to_string(); + link += "::"; + } + let msg = format!("See [`{}{}`]", link, ident); Some(quote!(#[doc = #msg])) };