From 90c4b14a302bf0884d6672f5d64fc12a0034dfc8 Mon Sep 17 00:00:00 2001 From: Chris Wailes Date: Tue, 10 Aug 2021 10:21:02 -0700 Subject: [PATCH] Removed commented out code A previous CL commented out code instead of removing it. This CL fixes this grave error. Test: TH Change-Id: I1daeaaa1ad90230aec639d603e7cdb9b61af251a --- rust/project_json.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rust/project_json.go b/rust/project_json.go index e15ec0f22..faa7db5f7 100644 --- a/rust/project_json.go +++ b/rust/project_json.go @@ -54,7 +54,6 @@ type rustProjectCrate struct { } type rustProjectJson struct { - // Roots []string `json:"roots"` Crates []rustProjectCrate `json:"crates"` } @@ -248,9 +247,6 @@ func (singleton *projectGeneratorSingleton) addCrate(ctx android.SingletonContex idx := len(singleton.project.Crates) singleton.knownCrates[rModule.Name()] = crateInfo{Idx: idx, Deps: deps} singleton.project.Crates = append(singleton.project.Crates, crate) - // rust-analyzer requires that all crates belong to at least one root: - // https://github.com/rust-analyzer/rust-analyzer/issues/4735. - // singleton.project.Roots = append(singleton.project.Roots, path.Dir(crate.RootModule)) return idx, true }