about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-07-04 01:08:15 +0000
committerbors <bors@rust-lang.org>2017-07-04 01:08:15 +0000
commited1ef191b5de05e0515ba6e1246908e2b3771617 (patch)
tree0e503faa6c1d2a71a82bc756ca49eab8d04c7ea5
parent734c83642cff23f0d9b4b8f006b05437697bcd91 (diff)
parentaff84eb3aa24119084079d5aa2d385bfaa5c8a2d (diff)
downloadrust-ed1ef191b5de05e0515ba6e1246908e2b3771617.tar.gz
rust-ed1ef191b5de05e0515ba6e1246908e2b3771617.zip
Auto merge of #42993 - stepancheg:editorconfig, r=brson
Add .editorconfig to src/rustllvm

... which uses 2 space indent instead of common 4 spaces.
-rw-r--r--src/rustllvm/.editorconfig6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/rustllvm/.editorconfig b/src/rustllvm/.editorconfig
new file mode 100644
index 00000000000..865cd45f708
--- /dev/null
+++ b/src/rustllvm/.editorconfig
@@ -0,0 +1,6 @@
+[*.{h,cpp}]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 2