diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-11-15 06:01:26 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-11-15 06:01:26 +0000 |
commit | ae6a803c0a38a423f2987b04283ec27900c80f0c (patch) | |
tree | 3661632f21e1f6ac738b11c5e88672e906a7c10b /crates/ra_prof | |
parent | bbb022d3999b3038549ec6c309efb065231c896a (diff) | |
parent | 50825a41d8661e4a93f92c81913c675a48247037 (diff) |
Merge #2246
2246: Normalize Line Endings r=matklad a=kjeremy
Line endings with git always confuse me so let's be explicit.
In doing this I ran `git add --renormalize .` on my repo per https://help.github.com/en/github/using-git/configuring-git-to-handle-line-endings and it converted a bunch of files. I then backed it all out and ran it again and only this one `Cargo.toml` file changed so I suspect line endings are just weird.
Co-authored-by: kjeremy <[email protected]>
Diffstat (limited to 'crates/ra_prof')
-rw-r--r-- | crates/ra_prof/Cargo.toml | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/crates/ra_prof/Cargo.toml b/crates/ra_prof/Cargo.toml index bb241258c..751bcdeb8 100644 --- a/crates/ra_prof/Cargo.toml +++ b/crates/ra_prof/Cargo.toml | |||
@@ -1,19 +1,19 @@ | |||
1 | [package] | 1 | [package] |
2 | edition = "2018" | 2 | edition = "2018" |
3 | name = "ra_prof" | 3 | name = "ra_prof" |
4 | version = "0.1.0" | 4 | version = "0.1.0" |
5 | authors = ["rust-analyzer developers"] | 5 | authors = ["rust-analyzer developers"] |
6 | publish = false | 6 | publish = false |
7 | 7 | ||
8 | [dependencies] | 8 | [dependencies] |
9 | once_cell = "1.0.1" | 9 | once_cell = "1.0.1" |
10 | itertools = "0.8.0" | 10 | itertools = "0.8.0" |
11 | backtrace = "0.3.28" | 11 | backtrace = "0.3.28" |
12 | 12 | ||
13 | [target.'cfg(not(target_env = "msvc"))'.dependencies] | 13 | [target.'cfg(not(target_env = "msvc"))'.dependencies] |
14 | jemallocator = { version = "0.3.2", optional = true } | 14 | jemallocator = { version = "0.3.2", optional = true } |
15 | jemalloc-ctl = { version = "0.3.2", optional = true } | 15 | jemalloc-ctl = { version = "0.3.2", optional = true } |
16 | 16 | ||
17 | [features] | 17 | [features] |
18 | jemalloc = [ "jemallocator", "jemalloc-ctl" ] | 18 | jemalloc = [ "jemallocator", "jemalloc-ctl" ] |
19 | cpu_profiler = [] | 19 | cpu_profiler = [] |