aboutsummaryrefslogtreecommitdiff
path: root/crates/project_model/src
Commit message (Collapse)AuthorAgeFilesLines
...
* Add support for Rust 2021.Mara Bos2021-01-011-0/+3
|
* Merge #7071bors[bot]2020-12-311-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7071: Pass --all-targets to "cargo check" when discovering external resources r=matklad a=WasabiFan There is a repro case and background in the linked issue. In short, the goal of this MR is to allow rust-analyzer to discover proc-macros which come from your tests (including, most importantly, dev-dependencies). By default, `cargo check` implies the equivalent of `--lib --bins`, meaning it'll check your libraries and binaries -- but not tests! This means proc-macros (or, I guess, build scripts as well) weren't discovered by rust-analyzer if they came from tests. One solution would be to manually add `--lib --bins --tests` (i.e., just augment the effective options to include tests). However, in this MR, I threw in `--all-targets`, which [according to the docs](https://doc.rust-lang.org/cargo/commands/cargo-check.html#target-selection) implies `--benches --examples` too. I have absolutely no idea what repercussions that will have on rust-analyzer for other projects, nor do I know if it's a problem that build scripts will now be discovered for tests/examples/benches. But I am not aware of a reason you _wouldn't_ want to discover these things in your examples too. I think the main drawback of this change is that it will likely slow down the `cargo check`. At a minimum, it'll now be checking your tests _and_ their dependencies. The `cargo check` docs also say that including `--tests` as I have here may cause your lib crate to be built _twice_, once for the normal target and again for unit tests. My reading of that caveat suggests that "building twice" means it's built once for the tests _inside_ your lib, with a test profile, and again for any consumers of your lib, now using a normal release profile or similar. This doesn't seem surprising. Very minor caveat: `--tests` will not include tests within a binary if it has `test = false` set in `Cargo.toml`. (I discovered this manually by trial-and-error, but hey, it actually says that in the docs!) This is likely not an issue, but _does_ mean that if you are -- for whatever reason -- disabling tests like that and then manually specifying `cargo test --package <...> --bin <...>` to run them, rust-analyzer will remain unaware of proc-macros in your tests. I have confirmed this fixes the original issue in my sandbox example linked in #7034 and in my own project in which I originally discovered this. I've left it configured as my default RA language server and will report back if I notice any unexpected side-effects. Fixes #7034 Co-authored-by: Kaelin Laundry <[email protected]>
| * Pass --all-targets to "cargo check"Kaelin Laundry2020-12-291-0/+5
| |
* | add working dir to cargo metadata fail messageslf-2020-12-311-1/+17
|/
* Fun times with rustfmtJon Gjengset2020-12-171-2/+1
|
* Update crates/project_model/src/cargo_workspace.rsJon Gjengset2020-12-171-1/+1
| | | Co-authored-by: Aleksey Kladov <[email protected]>
* Default to host platform for cargo metadataJon Gjengset2020-12-171-2/+30
| | | | | | | | | This modifies the logic for calling cargo metadata so that it will use the host platform if no explicit target platform is given. This is needed since cargo metadata defaults to outputting information for _all_ targets. Fixes #6908.
* Change recommendation when source can't be loaded from sysrootFlorian Diebold2020-12-131-1/+1
| | | | | | | | | Since we just tried running `rustup component add`, it doesn't make sense to me to recommend trying that again. If we're reaching this case, it's probably more likely that rustc was installed via package manager, in which case the source should be installed the same way (e.g. if you install the rust-src package on Ubuntu it will install a symlink in the right place to make our sysroot detection work).
* Remove some redundant allocationsJeremy Kolb2020-12-121-1/+1
|
* Use itertoolsJonas Schievink2020-12-101-3/+3
|
* Replicate Cargo environment variablesJonas Schievink2020-12-101-0/+39
|
* Apply environment set by build scriptsJonas Schievink2020-12-072-2/+20
|
* Pass `--target` when loading out dirs from checkJonas Schievink2020-12-071-0/+5
|
* Remove dummy ProcMacroClient in favor of OptionJonas Schievink2020-12-071-17/+22
|
* SimplifyAleksey Kladov2020-11-171-54/+50
|
* Make code more readableAleksey Kladov2020-11-171-186/+207
|
* MinorAleksey Kladov2020-11-171-4/+4
|
* SimplifyAleksey Kladov2020-11-171-16/+10
|
* Remove needless allocAleksey Kladov2020-11-171-1/+1
|
* Compress codeAleksey Kladov2020-11-171-64/+24
|
* simplifyAleksey Kladov2020-11-171-41/+32
|
* Remove dead codeAleksey Kladov2020-11-131-15/+0
|
* Cleanup workspace loading a tiny bitAleksey Kladov2020-11-132-26/+28
|
* Move tricky workspace logic to a separate moduleAleksey Kladov2020-11-132-602/+611
|
* Address review commentsXavier Denis2020-11-121-3/+2
|
* Reorder rustc_private loadingXavier Denis2020-11-111-87/+86
|
* Add support for loading rustc private cratesXavier Denis2020-11-112-67/+209
|
* Ignore RUST_SRC_PATH if it is set to invalid valueAleksey Kladov2020-11-061-2/+6
| | | | | | Folks report a ton of hard-to-diagnose issues, the solution for which is "unset RUST_SRC_PATH". Let's just ignore RUST_SRC_PATH when it won't work anyway!
* Remove more unreachable pubsAleksey Kladov2020-11-022-3/+3
|
* remove FIXME after rust 1.47 comes outyuqing2020-10-301-6/+1
|
* Support Display name in project.jsonAleksey Kladov2020-10-202-3/+7
|
* More type safety around namesAleksey Kladov2020-10-201-3/+5
|
* Add a hacky remidy for #6038Aleksey Kladov2020-10-201-0/+5
| | | | | | | The proper fix I think is: * move rust-lang/rust library crates to a separate workspace * when packaging rust-src component, vendor sources of external deps
* Log around sysroot discoveryAleksey Kladov2020-10-141-0/+4
|
* Update crates/project_model/src/sysroot.rsJonas Schievink2020-10-091-1/+1
| | | Co-authored-by: LaurenČ›iu Nicola <[email protected]>
* Add note if RUST_SRC_PATH is likely to be wrongJonas Schievink2020-10-091-2/+8
|
* Fix the hover dash issuesKirill Bulatov2020-10-021-2/+3
|
* Merge #6018bors[bot]2020-09-201-7/+14
|\ | | | | | | | | | | | | | | 6018: Correct project_root path for ProjectJson. r=jonas-schievink a=woody77 It was already the folder containing the rust-project.json file, not the file itself. This also removes the Option-ness of it, since it's now an infallible operation to set the member value. Co-authored-by: Aaron Wood <[email protected]>
| * Add rustdoc for ProjectJson methodsAaron Wood2020-09-201-0/+10
| |
| * Correct project_root path for ProjectJson.Aaron Wood2020-09-161-7/+4
| | | | | | | | It was already the folder containing the rust-project.json file, not the file itself.
* | Log failure to load crate root fileJonas Schievink2020-09-181-1/+7
|/
* Add support for custom flycheck commands with JSON project workspacesAaron Wood2020-09-161-0/+8
| | | | | Enable flychecks with JSON project workspaces if an override command was provided as part of the client configuration.
* Report better errors in project.json/sysrootJonas Schievink2020-09-113-16/+35
|
* Add sysroot shortcut to rust-project.jsonAleksey Kladov2020-08-252-19/+57
|
* Don't expose indexing detailsAleksey Kladov2020-08-252-24/+20
|
* Prepare to share sysroot lowering code between Cargo & ProjectJSONAleksey Kladov2020-08-252-105/+73
|
* Prep work for overriding sysrootAleksey Kladov2020-08-252-54/+61
| | | | | The idea here is to make auto-discovery optional, and to allow to set the path to sysroot directly. This is handy for JSON projects.
* Improve loggingAleksey Kladov2020-08-251-1/+15
|
* Better error if Cargo is not in PathAleksey Kladov2020-08-191-2/+9
|
* Rename ra_db -> base_dbAleksey Kladov2020-08-133-3/+3
|