Skip to content

Commit ae6a803

Browse files
bors[bot]kjeremy
andauthored
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]>
2 parents bbb022d + 50825a4 commit ae6a803

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
* text=auto eol=lf
12
crates/ra_syntax/test_data/** -text eof=LF
2-
crates/ra_ide_api/src/snapshots/** -text eof=LF

crates/ra_prof/Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
[package]
2-
edition = "2018"
3-
name = "ra_prof"
4-
version = "0.1.0"
5-
authors = ["rust-analyzer developers"]
6-
publish = false
7-
8-
[dependencies]
9-
once_cell = "1.0.1"
10-
itertools = "0.8.0"
11-
backtrace = "0.3.28"
12-
13-
[target.'cfg(not(target_env = "msvc"))'.dependencies]
14-
jemallocator = { version = "0.3.2", optional = true }
15-
jemalloc-ctl = { version = "0.3.2", optional = true }
16-
17-
[features]
18-
jemalloc = [ "jemallocator", "jemalloc-ctl" ]
19-
cpu_profiler = []
1+
[package]
2+
edition = "2018"
3+
name = "ra_prof"
4+
version = "0.1.0"
5+
authors = ["rust-analyzer developers"]
6+
publish = false
7+
8+
[dependencies]
9+
once_cell = "1.0.1"
10+
itertools = "0.8.0"
11+
backtrace = "0.3.28"
12+
13+
[target.'cfg(not(target_env = "msvc"))'.dependencies]
14+
jemallocator = { version = "0.3.2", optional = true }
15+
jemalloc-ctl = { version = "0.3.2", optional = true }
16+
17+
[features]
18+
jemalloc = [ "jemallocator", "jemalloc-ctl" ]
19+
cpu_profiler = []

0 commit comments

Comments
 (0)