ari-party/rojo
1
0
Fork 0
forked from rojo-rbx/rojo
Code Pull Requests Activity

Remove warnings for upgrading from 0.4.x

Browse Source
This commit is contained in:
Lucien Greathouse
2019-11-02 23:41:32 -07:00
parent 3a538f98ed
commit 9a2893c6bc
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/project.rs
View File

@@ -483,7 +483,6 @@ impl Project {
if let Some(project_path) = Self::locate(fuzzy_project_location) { if let Some(project_path) = Self::locate(fuzzy_project_location) {
Self::load_exact(&project_path) Self::load_exact(&project_path)
} else { } else {
Project::warn_if_4x_project_present(fuzzy_project_location);
Err(ProjectLoadError::NotFound) Err(ProjectLoadError::NotFound)
} }
} }
@@ -527,21 +526,6 @@ impl Project {
self.tree.validate_reserved_names(); 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 { pub fn folder_location(&self) -> &Path {
self.file_location.parent().unwrap() self.file_location.parent().unwrap()
} }

4
test-projects/legacy-0.4.x/rojo.json
View File

@@ -1,4 +0,0 @@
{
"name": "legacy",
"parittions": {}
}

6
test-projects/legacy-old-0.5.x/roblox-project.json
View File

@@ -1,6 +0,0 @@
{
"name": "Foo",
"tree": {
"$className": "Folder"
}
}