History

Merge pull request #1371 from MasterEnoc/rust

Update Rust to 1.48.0, fix 'notable trait' display

Simon Legner committed 5 years ago

Commit ece00d32 parents 4d3bae4 c5f7de63 files · +23 −16Browse files

Unified · Split

3 files
  1. lib/docs/filters/rust/clean_html.rb +18 −13
  2. lib/docs/filters/rust/entries.rb +4 −1
  3. lib/docs/scrapers/rust.rb +1 −2
lib/docs/filters/rust/clean_html.rb+18−13
@@ -71,19 +71,6 @@ module Docs · 70 unmodified lines
7171 doc.first_element_child.name = 'h1' if doc.first_element_child.name = 'h2'
7272 at_css('h1').content = 'Rust Documentation' if root_page?
7373
74− css('.table-display').each do |node|
75− node.css('td').each do |td|
76− node.before(td.children)
77− end
78− node.remove
79− end
80−
81− css('.important-traits').to_a.each_with_index do |node, index|
82− content = node.at_css('.content.hidden .content')
83− node.at_css('.content.hidden').replace(content) if content
84− node.parent.after(node) if node.parent.name.in?(%(h2 h3 h4))
85− end
86−
8774 css('code.content').each do |node|
8875 node.name = 'pre'
8976 node.css('.fmt-newline').each do |line|
@@ -97,6 +84,24 @@ module Docs · 7 unmodified lines
9784 node.previous_element.before(node)
9885 end
9986
87+ css('.sidebar').remove
88+
89+ css('.collapse-toggle').remove
90+
91+ # Fix how notable-traits sections are shown
92+
93+ css('.method').each do |node|
94+ traitSection = node.at_css('.notable-traits')
95+
96+ if traitSection
97+ traitSectionContent = traitSection.css('.notable-traits-tooltiptext')
98+ traitSection.css('.notable-traits-tooltip').remove
99+ traitSection.add_child(traitSectionContent)
100+ node.after(traitSection)
101+ end
102+
103+ end
104+
100105 doc
101106 end
102107 end
lib/docs/filters/rust/entries.rb+4−1
@@ -1,9 +1,11 @@
11 module Docs
22 class Rust
33 class EntriesFilter < Docs::EntriesFilter
4+
45 def get_name
56 if slug.start_with?('book') || slug.start_with?('reference')
6− at_css("#sidebar a[href='#{File.basename(slug)}']").content
7+ name = at_css("#sidebar a[href='#{File.basename(slug)}']")
8+ name ? name.content : 'Introduction'
79 elsif slug == 'error-index'
810 'Compiler Errors'
911 else
@@ -51,6 +53,7 @@ module Docs · 41 unmodified lines
5153 }.values
5254 end
5355 end
56+
5457 end
5558 end
5659 end
lib/docs/scrapers/rust.rb+1−2
@@ -3,12 +3,11 @@ · 2 unmodified lines
33 module Docs
44 class Rust < UrlScraper
55 self.type = 'rust'
6− self.release = '1.47.0'
6+ self.release = '1.48.0'
77 self.base_url = 'https://doc.rust-lang.org/'
88 self.root_path = 'book/index.html'
99 self.initial_paths = %w(
1010 reference/introduction.html
11− collections/index.html
1211 std/index.html
1312 error-index.html)
1413 self.links = {