Merge "Removed commented out code"

This commit is contained in:
Treehugger Robot 2021-08-11 05:30:45 +00:00 committed by Gerrit Code Review
commit 95048e9625

View file

@ -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
}