Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Rename ra_project_model -> project_model | Pavan Kumar Sunkara | 2020-08-13 | 1 | -544/+0 |
| | |||||
* | fmt | Aleksey Kladov | 2020-08-13 | 1 | -1/+1 |
| | |||||
* | Rename ra_cfg -> cfg | Aleksey Kladov | 2020-08-13 | 1 | -1/+1 |
| | |||||
* | Rename ra_toolchain -> toolchain | Aleksey Kladov | 2020-08-12 | 1 | -1/+1 |
| | |||||
* | Require quotes around key-value cfg flags in rust-project.json | Aleksey Kladov | 2020-07-23 | 1 | -47/+30 |
| | | | | This matches rustc command-line flags, as well as the build.rs format. | ||||
* | Merge #5505 | bors[bot] | 2020-07-23 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | | | | | | | | | 5505: Cleanup CFG API r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]> | ||||
| * | Cleanup CFG API | Aleksey Kladov | 2020-07-23 | 1 | -4/+4 |
| | | |||||
* | | More Rustic API for Env | Aleksey Kladov | 2020-07-21 | 1 | -4/+1 |
| | | |||||
* | | Replace OUT_DIR in project.json with general env | Aleksey Kladov | 2020-07-21 | 1 | -5/+2 |
| | | | | | | | | OUT_DIR doesn't make sense here, as this is a cargo-specific concept | ||||
* | | Replace roots with include/exclude directories | Aleksey Kladov | 2020-07-21 | 1 | -20/+9 |
| | | |||||
* | | Expose package roots more directly | Aleksey Kladov | 2020-07-21 | 1 | -30/+32 |
|/ | |||||
* | Automatically reload project info on Cargo.toml changes | Aleksey Kladov | 2020-07-10 | 1 | -1/+1 |
| | |||||
* | Fallback to target in cfg if not specified in project json config | Paul Daniel Faria | 2020-07-04 | 1 | -1/+1 |
| | |||||
* | Add optional target to crates in json project, lookup default cfgs per ↵ | Paul Daniel Faria | 2020-07-04 | 1 | -1/+10 |
| | | | | target when generating cfg list | ||||
* | Move cargo metadata off the main loop | Aleksey Kladov | 2020-07-02 | 1 | -2/+2 |
| | |||||
* | Use Strings for display names | Aleksey Kladov | 2020-07-01 | 1 | -5/+3 |
| | |||||
* | Use CrateName for semantic names | Aleksey Kladov | 2020-07-01 | 1 | -4/+1 |
| | |||||
* | Cleanup project.json deserialization | Aleksey Kladov | 2020-06-24 | 1 | -50/+27 |
| | |||||
* | Rename json_project -> project_json | Aleksey Kladov | 2020-06-24 | 1 | -8/+8 |
| | |||||
* | Be more explicit about absolute paths at various places | Aleksey Kladov | 2020-06-24 | 1 | -26/+25 |
| | |||||
* | New VFS | Aleksey Kladov | 2020-06-23 | 1 | -14/+1 |
| | |||||
* | Accept relative paths in rust-project.json | Thiébaud Weksteen | 2020-06-15 | 1 | -15/+17 |
| | | | | | If a relative path is found as part of Crate.root_module or Root.path, interpret it as relative to the location of the rust-project.json file. | ||||
* | Reduce OUT_DIR special casing | Aleksey Kladov | 2020-06-10 | 1 | -13/+7 |
| | |||||
* | Merge #4824 | bors[bot] | 2020-06-10 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | 4824: Correct "debug_assertion" to "debug_assertions" to match the cfg that the rust debug assert macros use. r=matklad a=woody77 This is for #4823. Co-authored-by: Aaron Wood <[email protected]> | ||||
| * | Correct "debug_assertion" to "debug_assertions" to match the cfg | Aaron Wood | 2020-06-10 | 1 | -1/+1 |
| | | | | | | | | option that the rust debug assert macros use. | ||||
* | | Finish transition to cfgs from the separate atoms and features. | Aaron Wood | 2020-06-09 | 1 | -6/+0 |
|/ | |||||
* | Use Option<&str> for target instead of Option<&String> | Paul Daniel Faria | 2020-06-08 | 1 | -3/+3 |
| | |||||
* | Remove default_cfg_options, pass target instead so it can be used for ↵ | Paul Daniel Faria | 2020-06-08 | 1 | -13/+13 |
| | | | | building cargo workspaces | ||||
* | Change management of test cfg to better support json projects | Paul Daniel Faria | 2020-06-07 | 1 | -6/+7 |
| | |||||
* | Document rust-project.json | Aleksey Kladov | 2020-06-03 | 1 | -2/+8 |
| | |||||
* | Rename ProjectRoot -> ProjectManifest | Aleksey Kladov | 2020-06-03 | 1 | -15/+15 |
| | |||||
* | Move project discovery | Aleksey Kladov | 2020-06-03 | 1 | -2/+14 |
| | |||||
* | Merge pull request #4382 from woody77/json_cfgs | Aleksey Kladov | 2020-06-03 | 1 | -0/+10 |
|\ | | | | | Begin transition to new fields for JsonProject crate cfgs | ||||
| * | Begin transition to new fields for JsonProject crate cfgs | Aaron Wood | 2020-05-09 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | This starts the transition to a new method of documenting the cfgs that are enabled for a given crate in the json file. This is changing from a list of atoms and a dict of key:value pairs, to a list of strings that is equivalent to that returned by `rustc --print cfg ..`, and parsed in the same manner by rust-analyzer. This is the first of two changes, which adds the new field that contains the list of strings. Next change will complete the transition and remove the previous fields. | ||||
* | | Make some stuff public so that they can be reused by other tools | Pavan Kumar Sunkara | 2020-05-14 | 1 | -1/+1 |
| | | |||||
* | | Simpify project discovery | veetaha | 2020-05-09 | 1 | -36/+15 |
| | | |||||
* | | Add stderr to error message | Aleksey Kladov | 2020-05-08 | 1 | -1/+6 |
| | | |||||
* | | Cleanup | Aleksey Kladov | 2020-05-08 | 1 | -16/+16 |
| | | |||||
* | | Rename ra_env -> ra_toolchain | Aleksey Kladov | 2020-05-08 | 1 | -1/+1 |
| | | |||||
* | | Merge #4329 | bors[bot] | 2020-05-08 | 1 | -1/+2 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4329: Look for `cargo`, `rustc`, and `rustup` in standard installation path r=matklad a=cdisselkoen Discussed in #3118. This is approximately a 90% fix for the issue described there. This PR creates a new crate `ra_env` with a function `get_path_for_executable()`; see docs there. `get_path_for_executable()` improves and generalizes the function `cargo_binary()` which was previously duplicated in the `ra_project_model` and `ra_flycheck` crates. (Both of those crates now depend on the new `ra_env` crate.) The new function checks (e.g.) `$CARGO` and `$PATH`, but also falls back on `~/.cargo/bin` manually before erroring out. This should allow most users to not have to worry about setting the `$CARGO` or `$PATH` variables for VSCode, which can be difficult e.g. on macOS as discussed in #3118. I've attempted to replace all calls to `cargo`, `rustc`, and `rustup` in rust-analyzer with appropriate invocations of `get_path_for_executable()`; I don't think I've missed any in Rust code, but there is at least one invocation in TypeScript code which I haven't fixed. (I'm not sure whether it's affected by the same problem or not.) https://github.com/rust-analyzer/rust-analyzer/blob/a4778ddb7a00f552a8e653bbf56ae9fd69cfe1d3/editors/code/src/cargo.ts#L79 I'm sure this PR could be improved a bunch, so I'm happy to take feedback/suggestions on how to solve this problem better, or just bikeshedding variable/function/crate names etc. cc @Veetaha Fixes #3118. Co-authored-by: Craig Disselkoen <[email protected]> Co-authored-by: veetaha <[email protected]> | ||||
| * | | pull function out into new crate ra_env; use in ra_flycheck as well | Craig Disselkoen | 2020-05-06 | 1 | -2/+2 |
| | | | |||||
| * | | more generic, find rustc as well | Craig Disselkoen | 2020-05-06 | 1 | -0/+1 |
| | | | |||||
* | | | Move feature desugaring to the right abstraction layer | Aleksey Kladov | 2020-05-08 | 1 | -2/+12 |
| | | | |||||
* | | | Merge #4296 | bors[bot] | 2020-05-07 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | 4296: Support cargo:rustc-cfg in build.rs r=matklad a=robojumper Fixes #4238. Co-authored-by: robojumper <[email protected]> | ||||
| * | | Assume cargo_metadata uses String for cfgs soon | robojumper | 2020-05-05 | 1 | -7/+1 |
| | | | |||||
| * | | Support build.rs cargo:rustc-cfg | robojumper | 2020-05-04 | 1 | -0/+7 |
| |/ | |||||
* | | Remove code duplicates | Christophe MASSOLIN | 2020-05-05 | 1 | -12/+6 |
| | | |||||
* | | Pass cargo.target to rustc | Christophe MASSOLIN | 2020-05-05 | 1 | -5/+13 |
|/ | |||||
* | Avoid lossy OsString conversions | Laurențiu Nicola | 2020-04-25 | 1 | -4/+8 |
| | |||||
* | Unmix error handling when discovering workspaces | Aleksey Kladov | 2020-04-16 | 1 | -55/+23 |
| | | | | | Hitting an io::Error is a legit problem. Finding more than one Cargo.toml is not. |