From 185c1d340c5b985195abf15f69b06aa6572d793c Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Sat, 7 Mar 2020 19:15:35 +0100
Subject: [PATCH] extract error_decl_mod_in_block

---
 src/librustc_parse/parser/module.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/librustc_parse/parser/module.rs b/src/librustc_parse/parser/module.rs
index 43d93e39575..c7d120e3cc6 100644
--- a/src/librustc_parse/parser/module.rs
+++ b/src/librustc_parse/parser/module.rs
@@ -129,23 +129,22 @@ impl<'a> Parser<'a> {
             DirectoryOwnership::Owned { .. } => {
                 paths.result.map_err(|err| self.span_fatal_err(id_sp, err))
             }
-            DirectoryOwnership::UnownedViaBlock => {
-                let msg = "Cannot declare a non-inline module inside a block \
-                    unless it has a path attribute";
-                let mut err = self.struct_span_err(id_sp, msg);
-                if paths.path_exists {
-                    let msg = format!(
-                        "Maybe `use` the module `{}` instead of redeclaring it",
-                        paths.name
-                    );
-                    err.span_note(id_sp, &msg);
-                }
-                Err(err)
-            }
+            DirectoryOwnership::UnownedViaBlock => self.error_decl_mod_in_block(id_sp, paths),
             DirectoryOwnership::UnownedViaMod => self.error_cannot_declare_mod_here(id_sp, paths),
         }
     }
 
+    fn error_decl_mod_in_block<T>(&self, id_sp: Span, paths: ModulePath) -> PResult<'a, T> {
+        let msg =
+            "Cannot declare a non-inline module inside a block unless it has a path attribute";
+        let mut err = self.struct_span_err(id_sp, msg);
+        if paths.path_exists {
+            let msg = format!("Maybe `use` the module `{}` instead of redeclaring it", paths.name);
+            err.span_note(id_sp, &msg);
+        }
+        Err(err)
+    }
+
     fn error_cannot_declare_mod_here<T>(&self, id_sp: Span, paths: ModulePath) -> PResult<'a, T> {
         let mut err = self.struct_span_err(id_sp, "cannot declare a new module at this location");
         if !id_sp.is_dummy() {