diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-05 15:25:59 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-10-05 15:25:59 +0100 |
| commit | ae6305b90c80eb919cfde985cba66975b6222ed2 (patch) | |
| tree | de601daf3714c4bda937e7cad05d048b69d16e71 /crates/ra_project_model/Cargo.toml | |
| parent | dbf869b4d2dac09df17609edf6e67c1611b71dc5 (diff) | |
| parent | c6303d9fee98232ac83a77f943c39d65c9c6b6db (diff) | |
Merge #1928
1928: Support `#[cfg(..)]` r=matklad a=oxalica
This PR implement `#[cfg(..)]` conditional compilation. It read default cfg options from `rustc --print cfg` with also hard-coded `test` and `debug_assertion` enabled.
Front-end settings are **not** included in this PR.
There is also a known issue that inner control attributes are totally ignored. I think it is **not** a part of `cfg` and create a separated issue for it. #1949
Fixes #1920
Related: #1073
Co-authored-by: uHOOCCOOHu <[email protected]>
Co-authored-by: oxalica <[email protected]>
Diffstat (limited to 'crates/ra_project_model/Cargo.toml')
| -rw-r--r-- | crates/ra_project_model/Cargo.toml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_project_model/Cargo.toml b/crates/ra_project_model/Cargo.toml index ae6b91aa6..a65100031 100644 --- a/crates/ra_project_model/Cargo.toml +++ b/crates/ra_project_model/Cargo.toml | |||
| @@ -12,6 +12,7 @@ cargo_metadata = "0.8.2" | |||
| 12 | 12 | ||
| 13 | ra_arena = { path = "../ra_arena" } | 13 | ra_arena = { path = "../ra_arena" } |
| 14 | ra_db = { path = "../ra_db" } | 14 | ra_db = { path = "../ra_db" } |
| 15 | ra_cfg = { path = "../ra_cfg" } | ||
| 15 | 16 | ||
| 16 | serde = { version = "1.0.89", features = ["derive"] } | 17 | serde = { version = "1.0.89", features = ["derive"] } |
| 17 | serde_json = "1.0.39" | 18 | serde_json = "1.0.39" |