From 9a2893c6bc2383999113a56774bc7357039cbaaa Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Sat, 2 Nov 2019 23:41:32 -0700 Subject: [PATCH] Remove warnings for upgrading from 0.4.x --- src/project.rs | 16 ---------------- test-projects/legacy-0.4.x/rojo.json | 4 ---- .../legacy-old-0.5.x/roblox-project.json | 6 ------ 3 files changed, 26 deletions(-) delete mode 100644 test-projects/legacy-0.4.x/rojo.json delete mode 100644 test-projects/legacy-old-0.5.x/roblox-project.json diff --git a/src/project.rs b/src/project.rs index fc039f34..91bfa6f6 100644 --- a/src/project.rs +++ b/src/project.rs @@ -483,7 +483,6 @@ impl Project { if let Some(project_path) = Self::locate(fuzzy_project_location) { Self::load_exact(&project_path) } else { - Project::warn_if_4x_project_present(fuzzy_project_location); Err(ProjectLoadError::NotFound) } } @@ -527,21 +526,6 @@ impl Project { self.tree.validate_reserved_names(); } - /// Issues a warning if no Rojo 0.5.x project is found, but there's a legacy - /// 0.4.x project in the directory. - fn warn_if_4x_project_present(folder: &Path) { - let file_path = folder.join("rojo.json"); - - if fs::metadata(file_path).is_ok() { - warn!("No Rojo 0.5 project file was found, but a Rojo 0.4 project was."); - warn!("Rojo 0.5.x uses 'default.project.json' files"); - warn!("Rojo 0.5.x uses 'rojo.json' files"); - warn!(""); - warn!("For help upgrading, see:"); - warn!("https://lpghatguy.github.io/rojo/guide/migrating-to-epiphany/"); - } - } - pub fn folder_location(&self) -> &Path { self.file_location.parent().unwrap() } diff --git a/test-projects/legacy-0.4.x/rojo.json b/test-projects/legacy-0.4.x/rojo.json deleted file mode 100644 index 547d3943..00000000 --- a/test-projects/legacy-0.4.x/rojo.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "name": "legacy", - "parittions": {} -} \ No newline at end of file diff --git a/test-projects/legacy-old-0.5.x/roblox-project.json b/test-projects/legacy-old-0.5.x/roblox-project.json deleted file mode 100644 index 4fcf72e3..00000000 --- a/test-projects/legacy-old-0.5.x/roblox-project.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "Foo", - "tree": { - "$className": "Folder" - } -} \ No newline at end of file