diff --git a/RELEASES.md b/RELEASES.md index aae2a66965014..6a5e4d86a6fc4 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -2059,7 +2059,7 @@ Internals Only [`Span::resolved_at`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.resolved_at [`Span::located_at`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.located_at [`Span::mixed_site`]: https://doc.rust-lang.org/stable/proc_macro/struct.Span.html#method.mixed_site -[`unix::process::CommandExt::arg0`]: https://doc.rust-lang.org/std/os/unix/process/trait.CommandExt.html#tymethod.arg0 +[`unix::process::CommandExt::arg0`]: https://doc.rust-lang.org/std/os/unix/process/trait.CommandExt.html#method.arg0 Version 1.44.1 (2020-06-18) @@ -3201,7 +3201,7 @@ Compatibility Notes [cargo/6934]: https://github.com/rust-lang/cargo/pull/6934/ [`VecDeque::rotate_left`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.rotate_left [`VecDeque::rotate_right`]: https://doc.rust-lang.org/std/collections/struct.VecDeque.html#method.rotate_right -[`Iterator::copied`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#tymethod.copied +[`Iterator::copied`]: https://doc.rust-lang.org/std/iter/trait.Iterator.html#method.copied [`io::IoSlice`]: https://doc.rust-lang.org/std/io/struct.IoSlice.html [`io::IoSliceMut`]: https://doc.rust-lang.org/std/io/struct.IoSliceMut.html [`Read::read_vectored`]: https://doc.rust-lang.org/std/io/trait.Read.html#method.read_vectored @@ -3450,7 +3450,7 @@ Compatibility Notes [57106]: https://github.com/rust-lang/rust/pull/57106/ [56470]: https://github.com/rust-lang/rust/pull/56470/ [cargo/6654]: https://github.com/rust-lang/cargo/pull/6654/ -[`Any::type_id`]: https://doc.rust-lang.org/std/any/trait.Any.html#tymethod.type_id +[`Any::type_id`]: https://doc.rust-lang.org/std/any/trait.Any.html#method.type_id [`Error::type_id`]: https://doc.rust-lang.org/std/error/trait.Error.html#method.type_id [`atomic::AtomicI16`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI16.html [`atomic::AtomicI32`]: https://doc.rust-lang.org/std/sync/atomic/struct.AtomicI32.html @@ -6534,7 +6534,7 @@ Compatibility Notes [`std::vec::IntoIter::as_slice`]: https://doc.rust-lang.org/std/vec/struct.IntoIter.html#method.as_slice [`std::vec::IntoIter::as_mut_slice`]: https://doc.rust-lang.org/std/vec/struct.IntoIter.html#method.as_mut_slice [`std::sync::mpsc::Receiver::try_iter`]: https://doc.rust-lang.org/std/sync/mpsc/struct.Receiver.html#method.try_iter -[`std::os::unix::process::CommandExt::before_exec`]: https://doc.rust-lang.org/std/os/unix/process/trait.CommandExt.html#tymethod.before_exec +[`std::os::unix::process::CommandExt::before_exec`]: https://doc.rust-lang.org/std/os/unix/process/trait.CommandExt.html#method.before_exec [`std::rc::Rc::strong_count`]: https://doc.rust-lang.org/std/rc/struct.Rc.html#method.strong_count [`std::rc::Rc::weak_count`]: https://doc.rust-lang.org/std/rc/struct.Rc.html#method.weak_count [`std::sync::Arc::strong_count`]: https://doc.rust-lang.org/std/sync/struct.Arc.html#method.strong_count @@ -7118,7 +7118,7 @@ Stabilized APIs * [`Ipv6Addr::octets`](https://doc.rust-lang.org/std/net/struct.Ipv6Addr.html#method.octets) * [`LinkedList::contains`](https://doc.rust-lang.org/std/collections/linked_list/struct.LinkedList.html#method.contains) * [`VecDeque::contains`](https://doc.rust-lang.org/std/collections/vec_deque/struct.VecDeque.html#method.contains) -* [`ExitStatusExt::from_raw`](https://doc.rust-lang.org/std/os/unix/process/trait.ExitStatusExt.html#tymethod.from_raw). +* [`ExitStatusExt::from_raw`](https://doc.rust-lang.org/std/os/unix/process/trait.ExitStatusExt.html#method.from_raw). Both on Unix and Windows. * [`Receiver::recv_timeout`](https://doc.rust-lang.org/std/sync/mpsc/struct.Receiver.html#method.recv_timeout) * [`RecvTimeoutError`](https://doc.rust-lang.org/std/sync/mpsc/enum.RecvTimeoutError.html) @@ -7734,20 +7734,20 @@ Compatibility Notes [`<*mut T>::as_mut`]: http://doc.rust-lang.org/nightly/std/primitive.pointer.html#method.as_mut [`<*mut T>::as_ref`]: http://doc.rust-lang.org/nightly/std/primitive.pointer.html#method.as_ref [`slice::copy_from_slice`]: http://doc.rust-lang.org/nightly/std/primitive.slice.html#method.copy_from_slice -[`AsciiExt::make_ascii_lowercase`]: http://doc.rust-lang.org/nightly/std/ascii/trait.AsciiExt.html#tymethod.make_ascii_lowercase -[`AsciiExt::make_ascii_uppercase`]: http://doc.rust-lang.org/nightly/std/ascii/trait.AsciiExt.html#tymethod.make_ascii_uppercase +[`AsciiExt::make_ascii_lowercase`]: http://doc.rust-lang.org/nightly/std/ascii/trait.AsciiExt.html#method.make_ascii_lowercase +[`AsciiExt::make_ascii_uppercase`]: http://doc.rust-lang.org/nightly/std/ascii/trait.AsciiExt.html#method.make_ascii_uppercase [`BTreeSet::get`]: http://doc.rust-lang.org/nightly/collections/btree/set/struct.BTreeSet.html#method.get [`BTreeSet::replace`]: http://doc.rust-lang.org/nightly/collections/btree/set/struct.BTreeSet.html#method.replace [`BTreeSet::take`]: http://doc.rust-lang.org/nightly/collections/btree/set/struct.BTreeSet.html#method.take -[`CommandExt::exec`]: http://doc.rust-lang.org/nightly/std/os/unix/process/trait.CommandExt.html#tymethod.exec +[`CommandExt::exec`]: http://doc.rust-lang.org/nightly/std/os/unix/process/trait.CommandExt.html#method.exec [`File::try_clone`]: http://doc.rust-lang.org/nightly/std/fs/struct.File.html#method.try_clone [`HashMap::hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashMap.html#method.hasher [`HashSet::get`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.get [`HashSet::hasher`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.hasher [`HashSet::replace`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.replace [`HashSet::take`]: http://doc.rust-lang.org/nightly/std/collections/struct.HashSet.html#method.take -[`JoinHandleExt::as_pthread_t`]: http://doc.rust-lang.org/nightly/std/os/unix/thread/trait.JoinHandleExt.html#tymethod.as_pthread_t -[`JoinHandleExt::into_pthread_t`]: http://doc.rust-lang.org/nightly/std/os/unix/thread/trait.JoinHandleExt.html#tymethod.into_pthread_t +[`JoinHandleExt::as_pthread_t`]: http://doc.rust-lang.org/nightly/std/os/unix/thread/trait.JoinHandleExt.html#method.as_pthread_t +[`JoinHandleExt::into_pthread_t`]: http://doc.rust-lang.org/nightly/std/os/unix/thread/trait.JoinHandleExt.html#method.into_pthread_t [`JoinHandleExt`]: http://doc.rust-lang.org/nightly/std/os/unix/thread/trait.JoinHandleExt.html [`OpenOptions::create_new`]: http://doc.rust-lang.org/nightly/std/fs/struct.OpenOptions.html#method.create_new [`OsStr::is_empty`]: http://doc.rust-lang.org/nightly/std/ffi/struct.OsStr.html#method.is_empty @@ -8169,7 +8169,7 @@ Compatibility Notes [1.7v]: https://github.com/rust-lang/rust/pull/29973 [RFC 1214]: https://github.com/rust-lang/rfcs/blob/master/text/1214-projections-lifetimes-and-wf.md [`BuildHasher::Hasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.Hasher.html -[`BuildHasher::build_hasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.BuildHasher.html#tymethod.build_hasher +[`BuildHasher::build_hasher`]: http://doc.rust-lang.org/nightly/std/hash/trait.BuildHasher.html#method.build_hasher [`CString::into_bytes_with_nul`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_bytes_with_nul [`CString::into_bytes`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_bytes [`CString::into_string`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_string @@ -8374,7 +8374,7 @@ Compatibility Notes [`fs::DirBuilder::new`]: http://doc.rust-lang.org/nightly/std/fs/struct.DirBuilder.html#method.new [`fs::DirBuilder::recursive`]: http://doc.rust-lang.org/nightly/std/fs/struct.DirBuilder.html#method.recursive [`fs::DirBuilder`]: http://doc.rust-lang.org/nightly/std/fs/struct.DirBuilder.html -[`os::unix::fs::DirBuilderExt::mode`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.DirBuilderExt.html#tymethod.mode +[`os::unix::fs::DirBuilderExt::mode`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.DirBuilderExt.html#method.mode [`os::unix::fs::DirBuilderExt`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.DirBuilderExt.html [`string::Drain`]: http://doc.rust-lang.org/nightly/std/string/struct.Drain.html [`string::String::drain`]: http://doc.rust-lang.org/nightly/std/string/struct.String.html#method.drain @@ -8553,10 +8553,10 @@ Miscellaneous [`BinaryHeap::into_sorted_vec`]: http://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html#method.into_sorted_vec [`BinaryHeap::into_vec`]: http://doc.rust-lang.org/nightly/std/collections/struct.BinaryHeap.html#method.into_vec [`Condvar::wait_timeout`]: http://doc.rust-lang.org/nightly/std/sync/struct.Condvar.html#method.wait_timeout -[`FileTypeExt::is_block_device`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#tymethod.is_block_device -[`FileTypeExt::is_char_device`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#tymethod.is_char_device -[`FileTypeExt::is_fifo`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#tymethod.is_fifo -[`FileTypeExt::is_socket`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#tymethod.is_socket +[`FileTypeExt::is_block_device`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#method.is_block_device +[`FileTypeExt::is_char_device`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#method.is_char_device +[`FileTypeExt::is_fifo`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#method.is_fifo +[`FileTypeExt::is_socket`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html#method.is_socket [`FileTypeExt`]: http://doc.rust-lang.org/nightly/std/os/unix/fs/trait.FileTypeExt.html [`Formatter::alternate`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.alternate [`Formatter::fill`]: http://doc.rust-lang.org/nightly/core/fmt/struct.Formatter.html#method.fill @@ -8719,7 +8719,7 @@ Miscellaneous [`CStr::to_string_lossy`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CStr.html#method.to_string_lossy [`CString::from_raw`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.from_raw [`CString::into_raw`]: http://doc.rust-lang.org/nightly/std/ffi/struct.CString.html#method.into_raw -[`IntoRawFd::into_raw_fd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.IntoRawFd.html#tymethod.into_raw_fd +[`IntoRawFd::into_raw_fd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.IntoRawFd.html#method.into_raw_fd [`IntoRawFd`]: http://doc.rust-lang.org/nightly/std/os/unix/io/trait.IntoRawFd.html [`Rc::downgrade`]: http://doc.rust-lang.org/nightly/alloc/rc/struct.Rc.html#method.downgrade [`Rc::get_mut`]: http://doc.rust-lang.org/nightly/alloc/rc/struct.Rc.html#method.get_mut diff --git a/library/core/src/char/methods.rs b/library/core/src/char/methods.rs index 7250dca2adfe4..d9913289ea128 100644 --- a/library/core/src/char/methods.rs +++ b/library/core/src/char/methods.rs @@ -382,7 +382,7 @@ impl char { /// println!("\\u{{2764}}"); /// ``` /// - /// Using [`to_string`](../std/string/trait.ToString.html#tymethod.to_string): + /// Using [`to_string`](../std/string/trait.ToString.html#method.to_string): /// /// ``` /// assert_eq!('❤'.escape_unicode().to_string(), "\\u{2764}"); @@ -460,7 +460,7 @@ impl char { /// println!("\\n"); /// ``` /// - /// Using [`to_string`](../std/string/trait.ToString.html#tymethod.to_string): + /// Using [`to_string`](../std/string/trait.ToString.html#method.to_string): /// /// ``` /// assert_eq!('\n'.escape_debug().to_string(), "\\n"); @@ -516,7 +516,7 @@ impl char { /// println!("\\\""); /// ``` /// - /// Using [`to_string`](../std/string/trait.ToString.html#tymethod.to_string): + /// Using [`to_string`](../std/string/trait.ToString.html#method.to_string): /// /// ``` /// assert_eq!('"'.escape_default().to_string(), "\\\""); @@ -961,7 +961,7 @@ impl char { /// println!("i\u{307}"); /// ``` /// - /// Using [`to_string`](../std/string/trait.ToString.html#tymethod.to_string): + /// Using [`to_string`](../std/string/trait.ToString.html#method.to_string): /// /// ``` /// assert_eq!('C'.to_lowercase().to_string(), "c"); @@ -1028,7 +1028,7 @@ impl char { /// println!("SS"); /// ``` /// - /// Using [`to_string`](../std/string/trait.ToString.html#tymethod.to_string): + /// Using [`to_string`](../std/string/trait.ToString.html#method.to_string): /// /// ``` /// assert_eq!('c'.to_uppercase().to_string(), "C"); diff --git a/library/core/src/fmt/mod.rs b/library/core/src/fmt/mod.rs index 8a2a64f8dc97f..ebb3791161d0e 100644 --- a/library/core/src/fmt/mod.rs +++ b/library/core/src/fmt/mod.rs @@ -103,7 +103,7 @@ pub struct Error; /// otherwise you should implement [`std::io::Write`]. /// /// [`std::io::Write`]: ../../std/io/trait.Write.html -/// [flushable]: ../../std/io/trait.Write.html#tymethod.flush +/// [flushable]: ../../std/io/trait.Write.html#method.flush #[stable(feature = "rust1", since = "1.0.0")] pub trait Write { /// Writes a string slice into this writer, returning whether the write diff --git a/src/doc/unstable-book/src/library-features/default-free-fn.md b/src/doc/unstable-book/src/library-features/default-free-fn.md index d40a27dddf362..c7787aacf2c57 100644 --- a/src/doc/unstable-book/src/library-features/default-free-fn.md +++ b/src/doc/unstable-book/src/library-features/default-free-fn.md @@ -10,7 +10,7 @@ Adds a free `default()` function to the `std::default` module. This function just forwards to [`Default::default()`], but may remove repetition of the word "default" from the call site. -[`Default::default()`]: https://doc.rust-lang.org/nightly/std/default/trait.Default.html#tymethod.default +[`Default::default()`]: https://doc.rust-lang.org/nightly/std/default/trait.Default.html#method.default Here is an example: diff --git a/src/librustdoc/formats/item_type.rs b/src/librustdoc/formats/item_type.rs index 3979d29b673fd..142cc25218f07 100644 --- a/src/librustdoc/formats/item_type.rs +++ b/src/librustdoc/formats/item_type.rs @@ -160,8 +160,7 @@ impl ItemType { ItemType::Static => "static", ItemType::Trait => "trait", ItemType::Impl => "impl", - ItemType::TyMethod => "tymethod", - ItemType::Method => "method", + ItemType::Method | ItemType::TyMethod => "method", ItemType::StructField => "structfield", ItemType::Variant => "variant", ItemType::Macro => "macro", diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 32e4a82918421..8a1b8d24dcefa 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -2276,7 +2276,7 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean "

\ Required Methods

", |m| m.is_ty_method(), - |out, sym| write!(out, "{0}", sym), + |out, sym| write!(out, "{0}", sym), "
", ); @@ -2422,8 +2422,7 @@ fn item_ty_to_strs(ty: ItemType) -> (&'static str, &'static str) { ItemType::Constant => ("constants", "Constants"), ItemType::Trait => ("traits", "Traits"), ItemType::Impl => ("impls", "Implementations"), - ItemType::TyMethod => ("tymethods", "Type Methods"), - ItemType::Method => ("methods", "Methods"), + ItemType::Method | ItemType::TyMethod => ("methods", "Methods"), ItemType::StructField => ("fields", "Struct Fields"), ItemType::Variant => ("variants", "Variants"), ItemType::Macro => ("macros", "Macros"), diff --git a/src/librustdoc/html/static/css/themes/ayu.css b/src/librustdoc/html/static/css/themes/ayu.css index 5d60aca6f27cd..8dc6bd25658be 100644 --- a/src/librustdoc/html/static/css/themes/ayu.css +++ b/src/librustdoc/html/static/css/themes/ayu.css @@ -182,8 +182,8 @@ pre, .rustdoc.source .example-wrap { .content a.associatedtype, .block a.current.associatedtype { color: #39AFD7; } .content span.fn, .content a.fn, .content span.method, -.content a.method, .content span.tymethod, -.content a.tymethod, .content .fnname { +.content a.method, +.content .fnname { color: #fdd687; } .content span.attr, .content a.attr, .content span.derive, @@ -442,7 +442,7 @@ above the `@media (max-width: 700px)` rules due to a bug in the css checker */ pre.rust .lifetime {} .stab.unstable {} h2, -h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type):not(.tymethod) {} +h3:not(.impl):not(.method):not(.type), h4:not(.method):not(.type) {} .content span.enum,.content a.enum,.block a.current.enum {} .content span.constant,.content a.constant,.block a.current.constant,.content span.static, .content a.static, .block a.current.static {} @@ -450,7 +450,7 @@ h3:not(.impl):not(.method):not(.type):not(.tymethod), h4:not(.method):not(.type) pre.rust .comment {} .content span.traitalias,.content a.traitalias,.block a.current.traitalias {} .content span.fn,.content a.fn,.block a.current.fn,.content span.method,.content a.method, -.block a.current.method,.content span.tymethod,.content a.tymethod,.block a.current.tymethod, +.block a.current.method, .content .fnname {} pre.rust .kw {} pre.rust .self,pre.rust .bool-val,pre.rust .prelude-val,pre.rust .attribute, @@ -476,8 +476,7 @@ a.result-enum:focus {} a.result-struct:focus {} a.result-union:focus {} a.result-fn:focus, -a.result-method:focus, -a.result-tymethod:focus {} +a.result-method:focus {} a.result-type:focus {} a.result-associatedtype:focus {} a.result-foreigntype:focus {} diff --git a/src/librustdoc/html/static/css/themes/dark.css b/src/librustdoc/html/static/css/themes/dark.css index 96588af54e8fb..c0283c5f73c04 100644 --- a/src/librustdoc/html/static/css/themes/dark.css +++ b/src/librustdoc/html/static/css/themes/dark.css @@ -109,8 +109,7 @@ a.result-enum:focus { background-color: #194e9f; } a.result-struct:focus { background-color: #194e9f; } a.result-union:focus { background-color: #194e9f; } a.result-fn:focus, -a.result-method:focus, -a.result-tymethod:focus { background-color: #4950ed; } +a.result-method:focus { background-color: #4950ed; } a.result-type:focus { background-color: #194e9f; } a.result-associatedtype:focus { background-color: #884719; } a.result-foreigntype:focus { background-color: #194e9f; } @@ -144,7 +143,6 @@ a.result-keyword:focus { background-color: #884719; } .content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #b78cf2; } .content span.fn, .content a.fn, .block a.current.fn, .content span.method, .content a.method, .block a.current.method, -.content span.tymethod, .content a.tymethod, .block a.current.tymethod, .content .fnname{ color: #2BAB63; } .content span.keyword, .content a.keyword, .block a.current.keyword { color: #D2991D; } diff --git a/src/librustdoc/html/static/css/themes/light.css b/src/librustdoc/html/static/css/themes/light.css index edb346c23b48c..901ea86b4135d 100644 --- a/src/librustdoc/html/static/css/themes/light.css +++ b/src/librustdoc/html/static/css/themes/light.css @@ -109,8 +109,7 @@ a.result-enum:focus { background-color: #e7b1a0; } a.result-struct:focus { background-color: #e7b1a0; } a.result-union:focus { background-color: #e7b1a0; } a.result-fn:focus, -a.result-method:focus, -a.result-tymethod:focus { background-color: #c6afb3; } +a.result-method:focus { background-color: #c6afb3; } a.result-type:focus { background-color: #e7b1a0; } a.result-associatedtype:focus { background-color: #afc6e4; } a.result-foreigntype:focus { background-color: #e7b1a0; } @@ -144,7 +143,6 @@ a.result-keyword:focus { background-color: #afc6e4; } .content span.traitalias, .content a.traitalias, .block a.current.traitalias { color: #5137AD; } .content span.fn, .content a.fn, .block a.current.fn, .content span.method, .content a.method, .block a.current.method, -.content span.tymethod, .content a.tymethod, .block a.current.tymethod, .content .fnname { color: #AD7C37; } .content span.keyword, .content a.keyword, .block a.current.keyword { color: #3873AD; } diff --git a/src/librustdoc/html/static/js/search.js b/src/librustdoc/html/static/js/search.js index 104464b388114..5d542c7151350 100644 --- a/src/librustdoc/html/static/js/search.js +++ b/src/librustdoc/html/static/js/search.js @@ -15,7 +15,6 @@ var itemTypes = [ "static", "trait", "impl", - "tymethod", "method", "structfield", "variant", @@ -566,7 +565,7 @@ window.initSearch = function(rawSearchIndex) { case "constant": return name === "associatedconstant"; case "fn": - return name === "method" || name === "tymethod"; + return name === "method"; case "type": return name === "primitive" || name === "associatedtype"; case "trait": diff --git a/src/librustdoc/passes/collect_intra_doc_links.rs b/src/librustdoc/passes/collect_intra_doc_links.rs index e1747f3e39265..50de3def6dcc9 100644 --- a/src/librustdoc/passes/collect_intra_doc_links.rs +++ b/src/librustdoc/passes/collect_intra_doc_links.rs @@ -294,7 +294,6 @@ crate struct ItemFragment(FragmentKind, DefId); #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq)] crate enum FragmentKind { Method, - TyMethod, AssociatedConstant, AssociatedType, @@ -309,13 +308,7 @@ impl ItemFragment { fn from_assoc_item(item: &ty::AssocItem) -> Self { let def_id = item.def_id; match item.kind { - ty::AssocKind::Fn => { - if item.defaultness.has_value() { - ItemFragment(FragmentKind::Method, def_id) - } else { - ItemFragment(FragmentKind::TyMethod, def_id) - } - } + ty::AssocKind::Fn => ItemFragment(FragmentKind::Method, def_id), ty::AssocKind::Const => ItemFragment(FragmentKind::AssociatedConstant, def_id), ty::AssocKind::Type => ItemFragment(FragmentKind::AssociatedType, def_id), } @@ -329,7 +322,6 @@ impl ItemFragment { let name = tcx.item_name(def_id); match kind { FragmentKind::Method => write!(s, "method.{}", name), - FragmentKind::TyMethod => write!(s, "tymethod.{}", name), FragmentKind::AssociatedConstant => write!(s, "associatedconstant.{}", name), FragmentKind::AssociatedType => write!(s, "associatedtype.{}", name), FragmentKind::StructField => write!(s, "structfield.{}", name), diff --git a/src/librustdoc/passes/stripper.rs b/src/librustdoc/passes/stripper.rs index 7b07974ae01c6..b9f8ffd17cd71 100644 --- a/src/librustdoc/passes/stripper.rs +++ b/src/librustdoc/passes/stripper.rs @@ -71,7 +71,7 @@ impl<'a> DocFolder for Stripper<'a> { clean::ImplItem(..) => {} - // tymethods have no control over privacy + // trait methods have no control over privacy clean::TyMethodItem(..) => {} // Proc-macros are always public diff --git a/src/test/rustdoc-js/doc-alias.js b/src/test/rustdoc-js/doc-alias.js index ff188d5145801..83e5c83457d9e 100644 --- a/src/test/rustdoc-js/doc-alias.js +++ b/src/test/rustdoc-js/doc-alias.js @@ -169,7 +169,7 @@ const EXPECTED = [ 'path': 'doc_alias::Trait', 'name': 'function', 'alias': 'TraitFunctionItem', - 'href': '../doc_alias/trait.Trait.html#tymethod.function', + 'href': '../doc_alias/trait.Trait.html#method.function', 'is_alias': true }, ], diff --git a/src/test/rustdoc/assoc-types.rs b/src/test/rustdoc/assoc-types.rs index d9e4ffab1c7d5..93201cdb04ace 100644 --- a/src/test/rustdoc/assoc-types.rs +++ b/src/test/rustdoc/assoc-types.rs @@ -1,12 +1,12 @@ -#![crate_type="lib"] +#![crate_type = "lib"] // @has assoc_types/trait.Index.html pub trait Index { - // @has - '//*[@id="associatedtype.Output"]//h4[@class="code-header"]' 'type Output: ?Sized' + // @has - '//*[@id="associatedtype.Output"]//h4[@class="code-header"]' 'type Output: ?Sized' type Output: ?Sized; - // @has - '//*[@id="tymethod.index"]//h4[@class="code-header"]' \ + // @has - '//*[@id="method.index"]//h4[@class="code-header"]' \ // "fn index<'a>(&'a self, index: I) -> &'a Self::Output" - // @has - '//*[@id="tymethod.index"]//h4[@class="code-header"]//a[@href="trait.Index.html#associatedtype.Output"]' \ + // @has - '//*[@id="method.index"]//h4[@class="code-header"]//a[@href="trait.Index.html#associatedtype.Output"]' \ // "Output" fn index<'a>(&'a self, index: I) -> &'a Self::Output; } @@ -25,13 +25,14 @@ pub trait Feed { // @has assoc_types/fn.use_input.html // @has - '//*[@class="rust fn"]' 'T::Input' // @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input' -pub fn use_input(_feed: &T, _element: T::Input) { } +pub fn use_input(_feed: &T, _element: T::Input) {} // @has assoc_types/fn.cmp_input.html // @has - '//*[@class="rust fn"]' 'where T::Input: PartialEq' // @has - '//*[@class="rust fn"]//a[@href="trait.Feed.html#associatedtype.Input"]' 'Input' pub fn cmp_input(a: &T::Input, b: &U::Input) -> bool - where T::Input: PartialEq +where + T::Input: PartialEq, { a == b } diff --git a/src/test/rustdoc/default-trait-method-link.rs b/src/test/rustdoc/default-trait-method-link.rs index 7bcd2a3c149e9..98ecfa38a5bd8 100644 --- a/src/test/rustdoc/default-trait-method-link.rs +++ b/src/test/rustdoc/default-trait-method-link.rs @@ -1,6 +1,6 @@ #![crate_name = "foo"] -// @has foo/trait.Foo.html '//a[@href="trait.Foo.html#tymethod.req"]' 'req' +// @has foo/trait.Foo.html '//a[@href="trait.Foo.html#method.req"]' 'req' // @has foo/trait.Foo.html '//a[@href="trait.Foo.html#method.prov"]' 'prov' /// Always make sure to implement [`req`], but you don't have to implement [`prov`]. diff --git a/src/test/rustdoc/default-trait-method.rs b/src/test/rustdoc/default-trait-method.rs index 6d0e339c48dc5..347aacf7d61e9 100644 --- a/src/test/rustdoc/default-trait-method.rs +++ b/src/test/rustdoc/default-trait-method.rs @@ -1,10 +1,10 @@ #![feature(min_specialization)] // @has default_trait_method/trait.Item.html -// @has - '//*[@id="tymethod.foo"]' 'fn foo()' -// @!has - '//*[@id="tymethod.foo"]' 'default fn foo()' -// @has - '//*[@id="tymethod.bar"]' 'fn bar()' -// @!has - '//*[@id="tymethod.bar"]' 'default fn bar()' +// @has - '//*[@id="method.foo"]' 'fn foo()' +// @!has - '//*[@id="method.foo"]' 'default fn foo()' +// @has - '//*[@id="method.bar"]' 'fn bar()' +// @!has - '//*[@id="method.bar"]' 'default fn bar()' // @has - '//*[@id="method.baz"]' 'fn baz()' // @!has - '//*[@id="method.baz"]' 'default fn baz()' pub trait Item { diff --git a/src/test/rustdoc/extern-method.rs b/src/test/rustdoc/extern-method.rs index 9cf5fc190af0f..d33ce96d3c5af 100644 --- a/src/test/rustdoc/extern-method.rs +++ b/src/test/rustdoc/extern-method.rs @@ -6,14 +6,14 @@ extern crate rustdoc_extern_method as foo; // @has extern_method/trait.Foo.html //pre "pub trait Foo" -// @has - '//*[@id="tymethod.foo"]//h4[@class="code-header"]' 'extern "rust-call" fn foo' +// @has - '//*[@id="method.foo"]//h4[@class="code-header"]' 'extern "rust-call" fn foo' // @has - '//*[@id="method.foo_"]//h4[@class="code-header"]' 'extern "rust-call" fn foo_' pub use foo::Foo; // @has extern_method/trait.Bar.html //pre "pub trait Bar" pub trait Bar { - // @has - '//*[@id="tymethod.bar"]//h4[@class="code-header"]' 'extern "rust-call" fn bar' + // @has - '//*[@id="method.bar"]//h4[@class="code-header"]' 'extern "rust-call" fn bar' extern "rust-call" fn bar(&self, _: ()); // @has - '//*[@id="method.bar_"]//h4[@class="code-header"]' 'extern "rust-call" fn bar_' - extern "rust-call" fn bar_(&self, _: ()) { } + extern "rust-call" fn bar_(&self, _: ()) {} } diff --git a/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs b/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs index 95b3e9b652303..9c6b3db7aef12 100644 --- a/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs +++ b/src/test/rustdoc/hidden-trait-methods-with-document-hidden-items.rs @@ -6,8 +6,8 @@ // @has foo/trait.Trait.html // @has - '//*[@id="associatedtype.Foo"]' 'type Foo' // @has - '//*[@id="associatedtype.Bar"]' 'type Bar' -// @has - '//*[@id="tymethod.f"]' 'fn f()' -// @has - '//*[@id="tymethod.g"]' 'fn g()' +// @has - '//*[@id="method.f"]' 'fn f()' +// @has - '//*[@id="method.g"]' 'fn g()' pub trait Trait { #[doc(hidden)] type Foo; diff --git a/src/test/rustdoc/hidden-trait-methods.rs b/src/test/rustdoc/hidden-trait-methods.rs index e924ba7d0acde..63b017e069004 100644 --- a/src/test/rustdoc/hidden-trait-methods.rs +++ b/src/test/rustdoc/hidden-trait-methods.rs @@ -4,8 +4,8 @@ // @has foo/trait.Trait.html // @!has - '//*[@id="associatedtype.Foo"]' 'type Foo' // @has - '//*[@id="associatedtype.Bar"]' 'type Bar' -// @!has - '//*[@id="tymethod.f"]' 'fn f()' -// @has - '//*[@id="tymethod.g"]' 'fn g()' +// @!has - '//*[@id="method.f"]' 'fn f()' +// @has - '//*[@id="method.g"]' 'fn g()' pub trait Trait { #[doc(hidden)] type Foo; diff --git a/src/test/rustdoc/inline_cross/assoc-items.rs b/src/test/rustdoc/inline_cross/assoc-items.rs index 231805a52b90e..c336a2a050ae1 100644 --- a/src/test/rustdoc/inline_cross/assoc-items.rs +++ b/src/test/rustdoc/inline_cross/assoc-items.rs @@ -35,7 +35,7 @@ pub use assoc_items::MyStruct; // @has - '//*[@id="associatedtype.TypeNoDefault"]' 'type TypeNoDefault' // @has - '//*[@class="docblock"]' 'docs for TypeNoDefault' // @has - '//*[@class="docblock"]' 'docs for TypeWithDefault' -// @has - '//*[@id="tymethod.method_no_default"]' 'fn method_no_default()' +// @has - '//*[@id="method.method_no_default"]' 'fn method_no_default()' // @has - '//*[@class="docblock"]' 'docs for method_no_default' // @has - '//*[@id="method.method_with_default"]' 'fn method_with_default()' // @has - '//*[@class="docblock"]' 'docs for method_with_default' diff --git a/src/test/rustdoc/inline_cross/default-trait-method.rs b/src/test/rustdoc/inline_cross/default-trait-method.rs index a4ec73a127d4e..d7d157b30487f 100644 --- a/src/test/rustdoc/inline_cross/default-trait-method.rs +++ b/src/test/rustdoc/inline_cross/default-trait-method.rs @@ -3,10 +3,10 @@ extern crate foo; // @has default_trait_method/trait.Item.html -// @has - '//*[@id="tymethod.foo"]' 'fn foo()' -// @!has - '//*[@id="tymethod.foo"]' 'default fn foo()' -// @has - '//*[@id="tymethod.bar"]' 'fn bar()' -// @!has - '//*[@id="tymethod.bar"]' 'default fn bar()' +// @has - '//*[@id="method.foo"]' 'fn foo()' +// @!has - '//*[@id="method.foo"]' 'default fn foo()' +// @has - '//*[@id="method.bar"]' 'fn bar()' +// @!has - '//*[@id="method.bar"]' 'default fn bar()' // @has - '//*[@id="method.baz"]' 'fn baz()' // @!has - '//*[@id="method.baz"]' 'default fn baz()' pub use foo::Item; diff --git a/src/test/rustdoc/intra-doc/basic.rs b/src/test/rustdoc/intra-doc/basic.rs index 39f5c298bc4a1..d3459ecd192c9 100644 --- a/src/test/rustdoc/intra-doc/basic.rs +++ b/src/test/rustdoc/intra-doc/basic.rs @@ -4,7 +4,7 @@ // @has - '//a/@href' 'enum.ThisEnum.html' // @has - '//a/@href' 'enum.ThisEnum.html#variant.ThisVariant' // @has - '//a/@href' 'trait.ThisTrait.html' -// @has - '//a/@href' 'trait.ThisTrait.html#tymethod.this_associated_method' +// @has - '//a/@href' 'trait.ThisTrait.html#method.this_associated_method' // @has - '//a/@href' 'trait.ThisTrait.html#associatedtype.ThisAssociatedType' // @has - '//a/@href' 'trait.ThisTrait.html#associatedconstant.THIS_ASSOCIATED_CONST' // @has - '//a/@href' 'trait.ThisTrait.html' @@ -53,14 +53,19 @@ pub struct ThisType; impl ThisType { pub fn this_method() {} } -pub enum ThisEnum { ThisVariant, ThisVariantCtor(u32), } +pub enum ThisEnum { + ThisVariant, + ThisVariantCtor(u32), +} pub trait ThisTrait { type ThisAssociatedType; const THIS_ASSOCIATED_CONST: u8; fn this_associated_method(); } pub type ThisAlias = Result<(), ()>; -pub union ThisUnion { this_field: usize, } +pub union ThisUnion { + this_field: usize, +} pub fn this_function() {} pub const THIS_CONST: usize = 5usize; @@ -71,7 +76,6 @@ pub trait SoAmbiguous {} #[allow(nonstandard_style)] pub fn SoAmbiguous() {} - // @has basic/struct.SomeOtherType.html '//a/@href' 'struct.ThisType.html' // @has - '//a/@href' 'struct.ThisType.html#method.this_method' // @has - '//a/@href' 'enum.ThisEnum.html' diff --git a/src/test/rustdoc/intra-doc/trait-item.rs b/src/test/rustdoc/intra-doc/trait-item.rs index e95dba33b5fd9..11ae31b3ceb48 100644 --- a/src/test/rustdoc/intra-doc/trait-item.rs +++ b/src/test/rustdoc/intra-doc/trait-item.rs @@ -3,7 +3,7 @@ /// Link to [S::assoc_fn()] /// Link to [Default::default()] // @has trait_item/struct.S.html '//*[@href="struct.S.html#method.assoc_fn"]' 'S::assoc_fn()' -// @has - '//*[@href="{{channel}}/core/default/trait.Default.html#tymethod.default"]' 'Default::default()' +// @has - '//*[@href="{{channel}}/core/default/trait.Default.html#method.default"]' 'Default::default()' pub struct S; impl S { diff --git a/src/test/rustdoc/issue-28478.rs b/src/test/rustdoc/issue-28478.rs index 497276e6826a1..ca1a1d3621e15 100644 --- a/src/test/rustdoc/issue-28478.rs +++ b/src/test/rustdoc/issue-28478.rs @@ -8,10 +8,10 @@ pub trait Bar { // @has - '//*[@id="associatedconstant.Baz"]' 'const Baz: usize' // @has - '//*[@href="#associatedconstant.Baz"]' 'Baz' const Baz: usize = 7; - // @has - '//*[@id="tymethod.bar"]' 'fn bar' + // @has - '//*[@id="method.bar"]' 'fn bar' fn bar(); // @has - '//*[@id="method.baz"]' 'fn baz' - fn baz() { } + fn baz() {} } // @has issue_28478/struct.Foo.html @@ -25,7 +25,7 @@ impl Foo { impl Bar for Foo { // @has - '//*[@href="trait.Bar.html#associatedtype.Bar"]' 'Bar' // @has - '//*[@href="trait.Bar.html#associatedconstant.Baz"]' 'Baz' - // @has - '//*[@href="trait.Bar.html#tymethod.bar"]' 'bar' + // @has - '//*[@href="trait.Bar.html#method.bar"]' 'bar' fn bar() {} // @has - '//*[@href="trait.Bar.html#method.baz"]' 'baz' } diff --git a/src/test/rustdoc/issue-86620.rs b/src/test/rustdoc/issue-86620.rs index b14e266f7f98d..d6514fbd4b0e1 100644 --- a/src/test/rustdoc/issue-86620.rs +++ b/src/test/rustdoc/issue-86620.rs @@ -4,6 +4,6 @@ extern crate issue_86620_1; use issue_86620_1::*; -// @!has issue_86620/struct.S.html '//div[@id="method.vzip"]//a[@class="fnname"]/@href' #tymethod.vzip +// @!has issue_86620/struct.S.html '//div[@id="method.vzip"]//a[@class="fnname"]/@href' #method.vzip // @has issue_86620/struct.S.html '//div[@id="method.vzip"]//a[@class="anchor"]/@href' #method.vzip pub struct S; diff --git a/src/test/rustdoc/trait-impl-items-links-and-anchors.rs b/src/test/rustdoc/trait-impl-items-links-and-anchors.rs index db9adb4838e3e..123245937ba99 100644 --- a/src/test/rustdoc/trait-impl-items-links-and-anchors.rs +++ b/src/test/rustdoc/trait-impl-items-links-and-anchors.rs @@ -13,7 +13,7 @@ impl MyTrait for String { // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-1"]//a[@class="constant"]/@href' #associatedconstant.VALUE // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-1"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-1 const VALUE: u32 = 5; - // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function + // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #method.trait_function // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function fn trait_function(&self) {} // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-1"]//a[@class="fnname"]/@href' #method.defaulted_override @@ -28,7 +28,7 @@ impl MyTrait for Vec { // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-2"]//a[@class="constant"]/@href' #associatedconstant.VALUE // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="associatedconstant.VALUE-2"]//a[@class="anchor"]/@href' #associatedconstant.VALUE-2 const VALUE: u32 = 5; - // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #tymethod.trait_function + // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' #method.trait_function // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.trait_function-1"]//a[@class="anchor"]/@href' #method.trait_function-1 fn trait_function(&self) {} // @has trait_impl_items_links_and_anchors/trait.MyTrait.html '//div[@id="method.defaulted_override-2"]//a[@class="fnname"]/@href' #method.defaulted_override @@ -45,7 +45,7 @@ impl MyTrait for MyStruct { // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedconstant.VALUE"]//a[@class="constant"]/@href' trait.MyTrait.html#associatedconstant.VALUE // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="associatedconstant.VALUE"]//a[@class="anchor"]/@href' #associatedconstant.VALUE const VALUE: u32 = 20; - // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' trait.MyTrait.html#tymethod.trait_function + // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.trait_function"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.trait_function // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.trait_function"]//a[@class="anchor"]/@href' #method.trait_function fn trait_function(&self) {} // @has trait_impl_items_links_and_anchors/struct.MyStruct.html '//div[@id="method.defaulted_override"]//a[@class="fnname"]/@href' trait.MyTrait.html#method.defaulted_override diff --git a/src/test/rustdoc/trait-impl.rs b/src/test/rustdoc/trait-impl.rs index 05ccc074bf110..731aea770f5ad 100644 --- a/src/test/rustdoc/trait-impl.rs +++ b/src/test/rustdoc/trait-impl.rs @@ -24,19 +24,19 @@ impl Trait for Struct { // @has trait_impl/struct.Struct.html '//*[@id="method.a"]/../../div[@class="docblock"]/p' 'Some long docs' // @!has - '//*[@id="method.a"]/../../div[@class="docblock"]/p' 'link will be added' // @has - '//*[@id="method.a"]/../../div[@class="docblock"]/p/a' 'Read more' - // @has - '//*[@id="method.a"]/../../div[@class="docblock"]/p/a/@href' 'trait.Trait.html#tymethod.a' + // @has - '//*[@id="method.a"]/../../div[@class="docblock"]/p/a/@href' 'trait.Trait.html#method.a' fn a() {} // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p' 'These docs contain' // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p/a' 'reference link' // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p/a/@href' 'https://example.com' // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p/a' 'Read more' - // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p/a/@href' 'trait.Trait.html#tymethod.b' + // @has - '//*[@id="method.b"]/../../div[@class="docblock"]/p/a/@href' 'trait.Trait.html#method.b' fn b() {} // @!has - '//*[@id="method.c"]/../../div[@class="docblock"]/p' 'code block' // @has - '//*[@id="method.c"]/../../div[@class="docblock"]/a' 'Read more' - // @has - '//*[@id="method.c"]/../../div[@class="docblock"]/a/@href' 'trait.Trait.html#tymethod.c' + // @has - '//*[@id="method.c"]/../../div[@class="docblock"]/a/@href' 'trait.Trait.html#method.c' fn c() {} // @has - '//*[@id="method.d"]/../../div[@class="docblock"]/p' 'Escaped formatting a*b*c* works' diff --git a/src/test/rustdoc/trait-visibility.rs b/src/test/rustdoc/trait-visibility.rs index 8ba3ee03a74f3..b09c602932890 100644 --- a/src/test/rustdoc/trait-visibility.rs +++ b/src/test/rustdoc/trait-visibility.rs @@ -4,5 +4,5 @@ extern crate trait_visibility; -// @has foo/trait.Bar.html '//a[@href="#tymethod.foo"]/..' "fn foo()" +// @has foo/trait.Bar.html '//a[@href="#method.foo"]/..' "fn foo()" pub use trait_visibility::Bar; diff --git a/src/tools/clippy/clippy_lints/src/format_args.rs b/src/tools/clippy/clippy_lints/src/format_args.rs index 17b0749a4a990..8b183bfd116e3 100644 --- a/src/tools/clippy/clippy_lints/src/format_args.rs +++ b/src/tools/clippy/clippy_lints/src/format_args.rs @@ -39,7 +39,7 @@ declare_clippy_lint! { declare_clippy_lint! { /// ### What it does - /// Checks for [`ToString::to_string`](https://doc.rust-lang.org/std/string/trait.ToString.html#tymethod.to_string) + /// Checks for [`ToString::to_string`](https://doc.rust-lang.org/std/string/trait.ToString.html#method.to_string) /// applied to a type that implements [`Display`](https://doc.rust-lang.org/std/fmt/trait.Display.html) /// in a macro that does formatting. /// diff --git a/src/tools/clippy/clippy_lints/src/methods/mod.rs b/src/tools/clippy/clippy_lints/src/methods/mod.rs index 4b43448bf7b98..9e66bf22250c8 100644 --- a/src/tools/clippy/clippy_lints/src/methods/mod.rs +++ b/src/tools/clippy/clippy_lints/src/methods/mod.rs @@ -1924,7 +1924,7 @@ declare_clippy_lint! { declare_clippy_lint! { /// ### What it does - /// Checks for unnecessary calls to [`ToOwned::to_owned`](https://doc.rust-lang.org/std/borrow/trait.ToOwned.html#tymethod.to_owned) + /// Checks for unnecessary calls to [`ToOwned::to_owned`](https://doc.rust-lang.org/std/borrow/trait.ToOwned.html#method.to_owned) /// and other `to_owned`-like functions. /// /// ### Why is this bad?