Skip to content

Commit b0d2ce9

Browse files
Merge pull request #2104 from practicalswift/tabs-to-spaces
[gardening] Fix some accidental tabs (\t → " ")
2 parents 1c0ee23 + 1ef6ea8 commit b0d2ce9

File tree

11 files changed

+39
-39
lines changed

11 files changed

+39
-39
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1529,8 +1529,8 @@ function(add_swift_library name)
15291529
${SWIFTLIB_IS_STDLIB_CORE_keyword}
15301530
${SWIFTLIB_IS_SDK_OVERLAY_keyword}
15311531
INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
1532-
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
1533-
)
1532+
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
1533+
)
15341534

15351535
# Add dependencies on the (not-yet-created) custom lipo target.
15361536
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})

docs/AccessControl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The general guiding principle of Swift access control:
66

77
**No entity can be defined in terms of another entity that has a lower
88
access level.**
9-
9+
1010
There are three levels of access: "private", "internal", and "public".
1111
Private entities can only be accessed from within the source file where they
1212
are defined. Internal entities can be accessed anywhere within the module they

docs/archive/LangRef.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -891,19 +891,19 @@ <h4 id="attribute-noreturn">No Return Attribute</h4>
891891
</pre>
892892

893893
<p>Attribute <tt>noreturn</tt> is only valid in the attribute list of a
894-
function declaration or in the attribute list of a <tt>type</tt>
895-
that describes a syntactic function type.
894+
function declaration or in the attribute list of a <tt>type</tt>
895+
that describes a syntactic function type.
896896
</p>
897897

898-
<p><tt>noreturn</tt> indicates to the compiler that the function will not
899-
return to the caller. This attribute should be used to suppress the
900-
uninitialized variable, missing return warnings and errors. The compiler is
901-
also allowed to more aggressively optimize the code in presence of this
902-
attribute.
898+
<p><tt>noreturn</tt> indicates to the compiler that the function will not
899+
return to the caller. This attribute should be used to suppress the
900+
uninitialized variable, missing return warnings and errors. The compiler is
901+
also allowed to more aggressively optimize the code in presence of this
902+
attribute.
903903
</p>
904904

905905
<p>If a function with no a <tt>noreturn</tt> attribute contains a
906-
<tt>return</tt> statement, an error will be raised.
906+
<tt>return</tt> statement, an error will be raised.
907907
</p>
908908

909909

docs/proposals/containers_value_type.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4-
<meta charset="utf-8" />
5-
<title>Swift containers and value types</title>
4+
<meta charset="utf-8" />
5+
<title>Swift containers and value types</title>
66
</head>
77
<body>
88

include/swift/AST/DiagnosticsParse.def

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1284,11 +1284,11 @@ ERROR(unsupported_conditional_compilation_integer,none,
12841284
ERROR(version_component_not_number,none,
12851285
"version component contains non-numeric characters", ())
12861286
ERROR(compiler_version_too_many_components,none,
1287-
"compiler version must not have more than five components", ())
1287+
"compiler version must not have more than five components", ())
12881288
WARNING(unused_compiler_version_component,none,
1289-
"the second version component is not used for comparison", ())
1289+
"the second version component is not used for comparison", ())
12901290
ERROR(empty_version_component,none,
1291-
"found empty version component", ())
1291+
"found empty version component", ())
12921292
ERROR(compiler_version_component_out_of_range,none,
12931293
"compiler version component out of range: must be in [0, %0]",
12941294
(unsigned))

include/swift/AST/TypeReprNodes.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ TYPEREPR(Attributed, TypeRepr)
3636

3737
ABSTRACT_TYPEREPR(Ident, TypeRepr)
3838
ABSTRACT_TYPEREPR(ComponentIdent, IdentTypeRepr)
39-
TYPEREPR(SimpleIdent, ComponentIdentTypeRepr)
40-
TYPEREPR(GenericIdent, ComponentIdentTypeRepr)
39+
TYPEREPR(SimpleIdent, ComponentIdentTypeRepr)
40+
TYPEREPR(GenericIdent, ComponentIdentTypeRepr)
4141
TYPEREPR(CompoundIdent, IdentTypeRepr)
4242

4343
TYPEREPR(Function, TypeRepr)

stdlib/public/core/UnsafePointer.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ public struct ${Self}<Pointee>
410410
@_transparent public
411411
func _withBridgeObject<U : AnyObject, R>(
412412
_ buffer: inout U?,
413-
@noescape body: AutoreleasingUnsafeMutablePointer<U?> -> R
413+
@noescape body: AutoreleasingUnsafeMutablePointer<U?> -> R
414414
) -> R {
415415
return self != nil ? body(&buffer) : body(nil)
416416
}

test/ClangModules/Inputs/enum-error.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
NSString *const TestErrorDomain;
44

55
TestError getErr() {
6-
return TEOne;
6+
return TEOne;
77
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module ImportAsMember {
2-
header "IAMVec.h"
2+
header "IAMVec.h"
33
}

utils/build-script-impl

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ function set_deployment_target_based_options() {
496496
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
497497
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
498498
)
499-
if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
499+
if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
500500
if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
501501
llvm_cmake_options=(
502502
"${llvm_cmake_options[@]}"
@@ -505,15 +505,15 @@ function set_deployment_target_based_options() {
505505
)
506506
fi
507507

508-
llvm_cmake_options=(
509-
"${llvm_cmake_options[@]}"
510-
"-DCMAKE_C_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
511-
"-DCMAKE_CXX_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
512-
"-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
513-
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
514-
"-DLLVM_PARALLEL_LINK_JOBS=$(num_llvm_parallel_lto_link_jobs)"
515-
)
516-
fi
508+
lvm_cmake_options=(
509+
"${llvm_cmake_options[@]}"
510+
"-DCMAKE_C_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
511+
"-DCMAKE_CXX_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
512+
"-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
513+
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
514+
"-DLLVM_PARALLEL_LINK_JOBS=$(num_llvm_parallel_lto_link_jobs)"
515+
)
516+
fi
517517

518518
if [[ $(true_false "${SWIFT_ENABLE_LTO}") = "TRUE" ]]; then
519519
if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then

utils/sil-mode.el

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@
4848
;; SIL Declaration
4949
`(,(regexp-opt '("getter" "setter" "allocator" "initializer" "enumelt"
5050
"destroyer" "globalaccessor" "objc") 'words) .
51-
font-lock-keyword-face)
51+
font-lock-keyword-face)
5252

5353
;; SIL Instructions - Allocation/Deallocation.
5454
`(,(regexp-opt '("alloc_stack" "alloc_ref" "alloc_ref_dynamic" "alloc_box"
5555
"alloc_value_buffer" "alloc_global"
5656
"dealloc_stack" "dealloc_box" "project_box" "dealloc_ref"
5757
"dealloc_partial_ref" "dealloc_value_buffer"
5858
"project_value_buffer")
59-
'words) . font-lock-keyword-face)
59+
'words) . font-lock-keyword-face)
6060

6161
;; SIL Instructions - Debug Information.
6262
`(,(regexp-opt '("debug_value" "debug_value_addr")
@@ -66,7 +66,7 @@
6666
`(,(regexp-opt '("load" "store" "assign" "mark_uninitialized"
6767
"mark_function_escape" "copy_addr" "destroy_addr"
6868
"index_addr" "index_raw_pointer" "to")
69-
'words) . font-lock-keyword-face)
69+
'words) . font-lock-keyword-face)
7070

7171
;; SIL Instructions - Reference Counting.
7272
`(,(regexp-opt '("strong_retain"
@@ -78,7 +78,7 @@
7878
"is_unique" "is_unique_or_pinned"
7979
"copy_block"
8080
"strong_unpin" "strong_pin" "is_unique" "is_unique_or_pinned")
81-
'words) . font-lock-keyword-face)
81+
'words) . font-lock-keyword-face)
8282
;; Literals
8383
`(,(regexp-opt '("function_ref"
8484
"integer_literal" "float_literal" "string_literal"
@@ -90,7 +90,7 @@
9090
'words) . font-lock-keyword-face)
9191
;; Function Application
9292
`(,(regexp-opt '("apply" "partial_apply" "builtin" "try_apply")
93-
'words) . font-lock-keyword-face)
93+
'words) . font-lock-keyword-face)
9494
;; Metatypes
9595
`(,(regexp-opt '("metatype" "value_metatype"
9696
"existential_metatype" "init_existential_metatype")
@@ -112,7 +112,7 @@
112112
"open_existential_addr"
113113
"init_existential_ref"
114114
"open_existential_ref")
115-
'words) . font-lock-keyword-face)
115+
'words) . font-lock-keyword-face)
116116
;; Unchecked Conversions
117117
`(,(regexp-opt '("upcast"
118118
"address_to_pointer" "pointer_to_address"
@@ -139,10 +139,10 @@
139139

140140
;; Checked Conversions
141141
`(,(regexp-opt '("unconditional_checked_cast" "unconditional_checked_cast_addr")
142-
'words) . font-lock-keyword-face)
142+
'words) . font-lock-keyword-face)
143143
;; Runtime Failures
144144
`(,(regexp-opt '("cond_fail")
145-
'words) . font-lock-keyword-face)
145+
'words) . font-lock-keyword-face)
146146
;; Terminators
147147
`(,(regexp-opt '("unreachable" "return" "br"
148148
"cond_br" "switch_value" "switch_enum"

0 commit comments

Comments
 (0)