Merge method and tymethod URL fragments and sections

This change was discussed on Zulip [here][1].

Here is an excerpt of my proposal, explaining my rationale:

    They add needless complexity to the intra-doc links code (e.g.,
    [whether an associated item is an impl vs a prototype has to be
    hardcoded in some circumstances][2]) and elsewhere in rustdoc. I don't
    think there's any need to distinguish between these two kinds. For
    example, associated constant prototypes in traits vs definitions in
    traits, trait impls, and inherent impls both use `associatedconstant`.

[1]: https://rust-lang.zulipchat.com/#narrow/stream/266220-rustdoc/topic/.5Bproposal.5D.20merge.20tymethod.20and.20method
[2]: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/trait.20assoc.20item.20-.3E.20impl.20assoc.20item

Author: camelid

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",

src/librustdoc/html/render/mod.rs

@@ -2276,7 +2276,7 @@ fn sidebar_trait(cx: &Context<'_>, buf: &mut Buffer, it: &clean::Item, t: &clean
         "<h3 class=\"sidebar-title\"><a href=\"#required-methods\">\
             Required Methods</a></h3><div class=\"sidebar-links\">",
         |m| m.is_ty_method(),
-        |out, sym| write!(out, "<a href=\"#tymethod.{0}\">{0}</a>", sym),
+        |out, sym| write!(out, "<a href=\"#method.{0}\">{0}</a>", sym),
         "</div>",
     );
 
@@ -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"),

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,15 +442,15 @@ 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 {}
 .content span.keyword,.content a.keyword,.block a.current.keyword {}
 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 {}

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; }
 

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; }
 

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":

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),