rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove Cancelable from Module API

Browse Source
This commit is contained in:
Aleksey Kladov
2019-01-15 18:26:29 +03:00
parent 91feed736f
commit ca52cf1ecd
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_hir/src/code_model_api.rs
View File

@@ -78,12 +78,12 @@ pub enum Problem {
impl Module {
/// Name of this module.
pub fn name(&self, db: &impl HirDatabase) -> Cancelable<Option<Name>> {
pub fn name(&self, db: &impl HirDatabase) -> Option<Name> {
self.name_impl(db)
}
/// Returns a node which defines this module. That is, a file or a `mod foo {}` with items.
pub fn definition_source(&self, db: &impl HirDatabase) -> Cancelable<(FileId, ModuleSource)> {
pub fn definition_source(&self, db: &impl HirDatabase) -> (FileId, ModuleSource) {
self.definition_source_impl(db)
}
@@ -92,7 +92,7 @@ impl Module {
pub fn declaration_source(
&self,
db: &impl HirDatabase,
) -> Cancelable<Option<(FileId, TreeArc<ast::Module>)>> {
) -> Option<(FileId, TreeArc<ast::Module>)> {
self.declaration_source_impl(db)
}