itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #1844

Browse Source 
1844: Support bare `Trait` without dyn r=flodiebold a=flodiebold



Co-authored-by: Florian Diebold <flodiebold@gmail.com>
This commit is contained in:
bors[bot] 2019-09-14 08:21:38 +00:00 committed by GitHub
commit 04789ef37b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crates/ra_hir/src/ty/lower.rs
View File

@ -124,8 +124,7 @@ impl Ty {
Ty::Unknown Ty::Unknown
} }
} else { } else {
// FIXME dyn Trait without the dyn Ty::Dyn(Arc::new([GenericPredicate::Implemented(trait_ref)]))
Ty::Unknown
}; };
} }
TypeNs::GenericParam(idx) => { TypeNs::GenericParam(idx) => {

20
crates/ra_hir/src/ty/tests.rs
View File

@ -3626,19 +3626,19 @@ fn test(x: Trait, y: &Trait) -> u64 {
@r###" @r###"
[27; 31) 'self': &Self [27; 31) 'self': &Self
[61; 63) '{}': () [61; 63) '{}': ()
[73; 74) 'x': {unknown} [73; 74) 'x': dyn Trait
[83; 84) 'y': &{unknown} [83; 84) 'y': &dyn Trait
[101; 176) '{ ...o(); }': () [101; 176) '{ ...o(); }': ()
[107; 108) 'x': {unknown} [107; 108) 'x': dyn Trait
[114; 115) 'y': &{unknown} [114; 115) 'y': &dyn Trait
[125; 126) 'z': {unknown} [125; 126) 'z': dyn Trait
[129; 132) 'bar': fn bar() -> {unknown} [129; 132) 'bar': fn bar() -> dyn Trait
[129; 134) 'bar()': {unknown} [129; 134) 'bar()': dyn Trait
[140; 141) 'x': {unknown} [140; 141) 'x': dyn Trait
[140; 147) 'x.foo()': u64 [140; 147) 'x.foo()': u64
[153; 154) 'y': &{unknown} [153; 154) 'y': &dyn Trait
[153; 160) 'y.foo()': u64 [153; 160) 'y.foo()': u64
[166; 167) 'z': {unknown} [166; 167) 'z': dyn Trait
[166; 173) 'z.foo()': u64 [166; 173) 'z.foo()': u64
"### "###
); );