Skip to content

Commit 0b75ae4

Browse files
bors[bot]Uupis
andcommitted
Merge #342
342: Snippets: change hard-coded 4 spaces to tab charaters r=ehuss a=Uupis When using snippets, Sublime Text expands the tabs based on user preferences. This way users who use 2-space indentation will get 2 spaces when using a snippet, users who use 4-space indentation will get 4 spaces, and users who use tabs will get tabs. I realize that the vast majority of Rust code seems to be 4-space indented, and that looks to be the encouraged style, but, for my own code, I prefer 2-space indentation, and I don't think this change necessarily goes against the 4-space style. The only imposition for future changes is that multi-line indented snippets need to be saved with tab characters. Co-authored-by: Uupis <uupis@icloud.com>
2 parents fae26a0 + 0c1e7ab commit 0b75ae4

22 files changed

+28
-28
lines changed

snippets/bench.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<content><![CDATA[
33
#[bench]
44
fn ${1:name}(b: &mut test::Bencher) {
5-
${2:b.iter(|| ${3:/* benchmark code */})}
5+
${2:b.iter(|| ${3:/* benchmark code */})}
66
}]]></content>
77
<tabTrigger>bench</tabTrigger>
88
<scope>source.rust</scope>

snippets/else.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[else {
3-
${1:unimplemented!();}
3+
${1:unimplemented!();}
44
}]]></content>
55
<tabTrigger>else</tabTrigger>
66
<scope>source.rust</scope>

snippets/enum.sublime-snippet

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<snippet>
22
<content><![CDATA[#[derive(Debug)]
33
enum ${1:Name} {
4-
${2:Variant1},
5-
${3:Variant2},
4+
${2:Variant1},
5+
${3:Variant2},
66
}]]></content>
77
<tabTrigger>enum</tabTrigger>
88
<scope>source.rust</scope>

snippets/extern-fn.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[extern "C" fn ${1:name}(${2:arg}: ${3:Type}) -> ${4:RetType} {
3-
${5:// add code here}
3+
${5:// add code here}
44
}]]></content>
55
<tabTrigger>extern-fn</tabTrigger>
66
<scope>source.rust</scope>

snippets/extern-mod.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[extern "C" {
3-
${2:// add code here}
3+
${2:// add code here}
44
}]]></content>
55
<tabTrigger>extern-mod</tabTrigger>
66
<scope>source.rust</scope>

snippets/fn.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[fn ${1:name}(${2:arg}: ${3:Type}) ${4/(^.+$)|^$/(?1:-> :)/}${4:RetType}${4/(^.+$)|^$/(?1: :)/}{
3-
${5:unimplemented!()}
3+
${5:unimplemented!()}
44
}]]></content>
55
<tabTrigger>fn</tabTrigger>
66
<scope>source.rust</scope>

snippets/for.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[for ${1:pat} in ${2:expr} {
3-
${3:unimplemented!();}
3+
${3:unimplemented!();}
44
}]]></content>
55
<tabTrigger>for</tabTrigger>
66
<scope>source.rust</scope>

snippets/if-let.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[if let ${1:Some(pat)} = ${2:expr} {
3-
${3:unimplemented!();}
3+
${3:unimplemented!();}
44
}]]></content>
55
<tabTrigger>if-let</tabTrigger>
66
<scope>source.rust</scope>

snippets/if.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[if ${1:condition} {
3-
${2:unimplemented!();}
3+
${2:unimplemented!();}
44
}]]></content>
55
<tabTrigger>if</tabTrigger>
66
<scope>source.rust</scope>

snippets/impl-trait.sublime-snippet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<snippet>
22
<content><![CDATA[impl ${1:Trait} for ${2:Type} {
3-
${3:// add code here}
3+
${3:// add code here}
44
}]]></content>
55
<tabTrigger>impl-trait</tabTrigger>
66
<scope>source.rust</scope>

0 commit comments

Comments
 (0)