diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-10 06:24:18 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-10 06:24:18 +0100 |
| commit | c9fc7251ca2ccdbd42fd21130139026878633b77 (patch) | |
| tree | 9c006d0d49beffcfd58526e013aaf3d0ea01756d /crates | |
| parent | ba821afa248153a58eede29048d2b21d30a2ea55 (diff) | |
| parent | f4ed2da966d1e568a67a7cae68880b2eb717c2cd (diff) | |
Merge #4824
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]>
Diffstat (limited to 'crates')
| -rw-r--r-- | crates/ra_project_model/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_project_model/src/lib.rs b/crates/ra_project_model/src/lib.rs index 47fa34ddf..c1f7e3ac5 100644 --- a/crates/ra_project_model/src/lib.rs +++ b/crates/ra_project_model/src/lib.rs | |||
| @@ -594,7 +594,7 @@ fn get_rustc_cfg_options(target: Option<&str>) -> CfgOptions { | |||
| 594 | Err(e) => log::error!("failed to get rustc cfgs: {:#}", e), | 594 | Err(e) => log::error!("failed to get rustc cfgs: {:#}", e), |
| 595 | } | 595 | } |
| 596 | 596 | ||
| 597 | cfg_options.insert_atom("debug_assertion".into()); | 597 | cfg_options.insert_atom("debug_assertions".into()); |
| 598 | 598 | ||
| 599 | cfg_options | 599 | cfg_options |
| 600 | } | 600 | } |