diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-11 16:30:05 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-11 16:30:05 +0100 |
| commit | bd61ad756cc0a7bfeaa5dae81ac5ab50a2e71697 (patch) | |
| tree | 382ff970758f62c2d4322c6daf2071b8543133f0 /crates/ra_hir_def/src/data.rs | |
| parent | 7c617000b832354ea405a9543276505c1c7e6a0a (diff) | |
| parent | 215e229dd1a495cda6541371c75145ba03f62de5 (diff) | |
Merge #4849
4849: Make known paths use `core` instead of `std` r=matklad a=jonas-schievink
I'm not sure if this causes problems today, but it seems like it easily could, if rust-analyzer processes the libstd sources for the right `--target` and that target is a `#![no_std]`-only target.
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/ra_hir_def/src/data.rs')
| -rw-r--r-- | crates/ra_hir_def/src/data.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir_def/src/data.rs b/crates/ra_hir_def/src/data.rs index 807195d25..53599e74a 100644 --- a/crates/ra_hir_def/src/data.rs +++ b/crates/ra_hir_def/src/data.rs | |||
| @@ -99,7 +99,7 @@ impl FunctionData { | |||
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | fn desugar_future_path(orig: TypeRef) -> Path { | 101 | fn desugar_future_path(orig: TypeRef) -> Path { |
| 102 | let path = path![std::future::Future]; | 102 | let path = path![core::future::Future]; |
| 103 | let mut generic_args: Vec<_> = std::iter::repeat(None).take(path.segments.len() - 1).collect(); | 103 | let mut generic_args: Vec<_> = std::iter::repeat(None).take(path.segments.len() - 1).collect(); |
| 104 | let mut last = GenericArgs::empty(); | 104 | let mut last = GenericArgs::empty(); |
| 105 | last.bindings.push(AssociatedTypeBinding { | 105 | last.bindings.push(AssociatedTypeBinding { |