Merge branch 'master' into i/docs-scroll

Author: ayazhafiz

docs/index.html

@@ -116,20 +116,22 @@
                   if (this.version !== this.oldVersion) {
                     const ConfigurationMdUrl =
                       `https://raw.githubusercontent.com/rust-lang/rustfmt/${this.version}/Configurations.md`;
+                    let res;
                     try {
-                      const res = await axios.get(ConfigurationMdUrl);
-                      const {
-                        about,
-                        configurationAbout,
-                        configurationDescriptions
-                      } = parseMarkdownAst(res.data);
-                      this.aboutHtml = marked.parser(about);
-                      this.configurationAboutHtml = marked.parser(configurationAbout);
-                      this.configurationDescriptions = configurationDescriptions;
-                      this.oldVersion = this.version;
-                    } catch(error) {
-                        this.aboutHtml = "<p>Failed to get configuration options for this version, please select the version from the dropdown above.</p>";
+                      res = await axios.get(ConfigurationMdUrl).catch(e => { throw e });
+                    } catch(e) {
+                      this.handleReqFailure(e);
+                      return;
                     }
+                    const {
+                      about,
+                      configurationAbout,
+                      configurationDescriptions
+                    } = parseMarkdownAst(res.data);
+                    this.aboutHtml = marked.parser(about);
+                    this.configurationAboutHtml = marked.parser(configurationAbout);
+                    this.configurationDescriptions = configurationDescriptions;
+                    this.oldVersion = this.version;
                   }
 
                   const ast = this.configurationDescriptions
@@ -172,7 +174,13 @@
                 }
               },
               created: async function() {
-                const {data: tags} = await axios.get(RusfmtTagsUrl);
+                let tags;
+                try {
+                  tags = (await axios.get(RusfmtTagsUrl)).data;
+                } catch(e) {
+                  this.handleReqFailure(e);
+                  return;
+                }
                 const reMajorVersion = /v(\d+)/;
                 const tagOptions = tags
                   .map(tag => tag.name)
@@ -188,6 +196,30 @@
                     this.scrolledOnce = true;
                   }
                 });
+              },
+              methods: {
+                handleReqFailure(e) {
+                  if (e.response.status === 404) {
+                    this.aboutHtml =
+                      "<p>Failed to get configuration options for this version, please select the version from the dropdown above.</p>";
+                  } else if (
+                    e.response.status === 403 &&
+                    e.response.headers["X-RateLimit-Remaining"] === 0
+                  ) {
+                    const resetDate = new Date(
+                      e.response.headers['X-RateLimit-Reset'] * 1000
+                    ).toLocaleString();
+                    this.aboutHtml =
+                      `<p>You have hit the GitHub API rate limit; documentation cannot be updated.` +
+                      `<p>The rate limit will be reset at ${resetDate}.</p>`;
+                  } else {
+                    this.aboutHtml =
+                      `<p>Ecountered an error when fetching documentation data:</p>` +
+                      `<pre><code>${e.response.data}</code></pre>` +
+                      `<p>We would appreciate <a href="https://github.com/rust-lang/rustfmt/issues/new?template=bug_report.md">a bug report</a>.` +
+                      `<p>Try refreshing the page.</p>`;
+                  }
+                }
               }
             });
             const extractDepthOnes = (ast) => {

src/formatting.rs

@@ -57,7 +57,6 @@ mod vertical;
 pub(crate) mod visitor;
 
 pub(crate) mod report;
-pub(crate) mod util;
 
 pub(crate) fn format_input_inner(
     input: Input,

src/formatting/comment.rs

@@ -11,7 +11,7 @@ use crate::formatting::{
     shape::{Indent, Shape},
     string::{rewrite_string, StringFormat},
     utils::{
-        count_newlines, first_line_width, last_line_width, tab_to_spaces,
+        count_newlines, first_line_width, format_code_block, last_line_width, tab_to_spaces,
         trim_end_unless_two_whitespaces, trim_left_preserve_layout, unicode_str_width,
     },
 };
@@ -685,10 +685,7 @@ impl<'a> CommentRewrite<'a> {
                         let mut config = self.fmt.config.clone();
                         config.set().wrap_comments(false);
                         if config.format_code_in_doc_comments() {
-                            if let Some(s) = crate::formatting::util::format_code_block(
-                                &self.code_block_buffer,
-                                &config,
-                            ) {
+                            if let Some(s) = format_code_block(&self.code_block_buffer, &config) {
                                 trim_custom_comment_prefix(s.as_ref())
                             } else {
                                 trim_custom_comment_prefix(&self.code_block_buffer)

src/formatting/macros.rs

@@ -33,11 +33,10 @@ use crate::formatting::{
     shape::{Indent, Shape},
     source_map::SpanUtils,
     spanned::Spanned,
-    util::{format_code_block, format_snippet},
     utils::{
-        count_newlines, format_visibility, indent_next_line, is_empty_line, mk_sp,
-        remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str,
-        NodeIdExt,
+        count_newlines, format_code_block, format_snippet, format_visibility, indent_next_line,
+        is_empty_line, mk_sp, remove_trailing_white_spaces, rewrite_ident,
+        trim_left_preserve_layout, wrap_str, NodeIdExt,
     },
     visitor::FmtVisitor,
 };