Skip to content

[gardening] Fix some accidental tabs (\t → " ") #2104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/modules/AddSwift.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1529,8 +1529,8 @@ function(add_swift_library name)
${SWIFTLIB_IS_STDLIB_CORE_keyword}
${SWIFTLIB_IS_SDK_OVERLAY_keyword}
INSTALL_IN_COMPONENT "${SWIFTLIB_INSTALL_IN_COMPONENT}"
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
)
DEPLOYMENT_VERSION_IOS "${SWIFTLIB_DEPLOYMENT_VERSION_IOS}"
)

# Add dependencies on the (not-yet-created) custom lipo target.
foreach(DEP ${SWIFTLIB_LINK_LIBRARIES})
Expand Down
2 changes: 1 addition & 1 deletion docs/AccessControl.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The general guiding principle of Swift access control:

**No entity can be defined in terms of another entity that has a lower
access level.**

There are three levels of access: "private", "internal", and "public".
Private entities can only be accessed from within the source file where they
are defined. Internal entities can be accessed anywhere within the module they
Expand Down
16 changes: 8 additions & 8 deletions docs/archive/LangRef.html
Original file line number Diff line number Diff line change
Expand Up @@ -891,19 +891,19 @@ <h4 id="attribute-noreturn">No Return Attribute</h4>
</pre>

<p>Attribute <tt>noreturn</tt> is only valid in the attribute list of a
function declaration or in the attribute list of a <tt>type</tt>
that describes a syntactic function type.
function declaration or in the attribute list of a <tt>type</tt>
that describes a syntactic function type.
</p>

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

<p>If a function with no a <tt>noreturn</tt> attribute contains a
<tt>return</tt> statement, an error will be raised.
<tt>return</tt> statement, an error will be raised.
</p>


Expand Down
4 changes: 2 additions & 2 deletions docs/proposals/containers_value_type.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<title>Swift containers and value types</title>
<meta charset="utf-8" />
<title>Swift containers and value types</title>
</head>
<body>

Expand Down
6 changes: 3 additions & 3 deletions include/swift/AST/DiagnosticsParse.def
Original file line number Diff line number Diff line change
Expand Up @@ -1284,11 +1284,11 @@ ERROR(unsupported_conditional_compilation_integer,none,
ERROR(version_component_not_number,none,
"version component contains non-numeric characters", ())
ERROR(compiler_version_too_many_components,none,
"compiler version must not have more than five components", ())
"compiler version must not have more than five components", ())
WARNING(unused_compiler_version_component,none,
"the second version component is not used for comparison", ())
"the second version component is not used for comparison", ())
ERROR(empty_version_component,none,
"found empty version component", ())
"found empty version component", ())
ERROR(compiler_version_component_out_of_range,none,
"compiler version component out of range: must be in [0, %0]",
(unsigned))
Expand Down
4 changes: 2 additions & 2 deletions include/swift/AST/TypeReprNodes.def
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ TYPEREPR(Attributed, TypeRepr)

ABSTRACT_TYPEREPR(Ident, TypeRepr)
ABSTRACT_TYPEREPR(ComponentIdent, IdentTypeRepr)
TYPEREPR(SimpleIdent, ComponentIdentTypeRepr)
TYPEREPR(GenericIdent, ComponentIdentTypeRepr)
TYPEREPR(SimpleIdent, ComponentIdentTypeRepr)
TYPEREPR(GenericIdent, ComponentIdentTypeRepr)
TYPEREPR(CompoundIdent, IdentTypeRepr)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems, the original intent is expressing a hierarchy:

  • ABSTRACT_TYPEREPR(Ident, TypeRepr)
    • ABSTRACT_TYPEREPR(ComponentIdent, IdentTypeRepr)
      • TYPEREPR(SimpleIdent, ComponentIdentTypeRepr)
      • TYPEREPR(GenericIdent, ComponentIdentTypeRepr)
    • TYPEREPR(CompoundIdent, IdentTypeRepr)


TYPEREPR(Function, TypeRepr)
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/core/UnsafePointer.swift.gyb
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ public struct ${Self}<Pointee>
@_transparent public
func _withBridgeObject<U : AnyObject, R>(
_ buffer: inout U?,
@noescape body: AutoreleasingUnsafeMutablePointer<U?> -> R
@noescape body: AutoreleasingUnsafeMutablePointer<U?> -> R
) -> R {
return self != nil ? body(&buffer) : body(nil)
}
Expand Down
2 changes: 1 addition & 1 deletion test/ClangModules/Inputs/enum-error.m
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
NSString *const TestErrorDomain;

TestError getErr() {
return TEOne;
return TEOne;
}
2 changes: 1 addition & 1 deletion test/Interpreter/Inputs/ImportAsMember/module.map
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ImportAsMember {
header "IAMVec.h"
header "IAMVec.h"
}
20 changes: 10 additions & 10 deletions utils/build-script-impl
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ function set_deployment_target_based_options() {
-DCOMPILER_RT_ENABLE_WATCHOS:BOOL=FALSE
-DCOMPILER_RT_ENABLE_TVOS:BOOL=FALSE
)
if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
if [[ $(true_false "${LLVM_ENABLE_LTO}") = "TRUE" ]]; then
if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
llvm_cmake_options=(
"${llvm_cmake_options[@]}"
Expand All @@ -505,15 +505,15 @@ function set_deployment_target_based_options() {
)
fi

llvm_cmake_options=(
"${llvm_cmake_options[@]}"
"-DCMAKE_C_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_CXX_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DLLVM_PARALLEL_LINK_JOBS=$(num_llvm_parallel_lto_link_jobs)"
)
fi
lvm_cmake_options=(
"${llvm_cmake_options[@]}"
"-DCMAKE_C_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_CXX_FLAGS=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_C_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=-O2 -flto -gline-tables-only -fno-stack-protector "
"-DLLVM_PARALLEL_LINK_JOBS=$(num_llvm_parallel_lto_link_jobs)"
)
fi

if [[ $(true_false "${SWIFT_ENABLE_LTO}") = "TRUE" ]]; then
if [[ $(cmake_needs_to_specify_standard_computed_defaults) = "TRUE" ]]; then
Expand Down
16 changes: 8 additions & 8 deletions utils/sil-mode.el
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@
;; SIL Declaration
`(,(regexp-opt '("getter" "setter" "allocator" "initializer" "enumelt"
"destroyer" "globalaccessor" "objc") 'words) .
font-lock-keyword-face)
font-lock-keyword-face)

;; SIL Instructions - Allocation/Deallocation.
`(,(regexp-opt '("alloc_stack" "alloc_ref" "alloc_ref_dynamic" "alloc_box"
"alloc_value_buffer" "alloc_global"
"dealloc_stack" "dealloc_box" "project_box" "dealloc_ref"
"dealloc_partial_ref" "dealloc_value_buffer"
"project_value_buffer")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)

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

;; SIL Instructions - Reference Counting.
`(,(regexp-opt '("strong_retain"
Expand All @@ -78,7 +78,7 @@
"is_unique" "is_unique_or_pinned"
"copy_block"
"strong_unpin" "strong_pin" "is_unique" "is_unique_or_pinned")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)
;; Literals
`(,(regexp-opt '("function_ref"
"integer_literal" "float_literal" "string_literal"
Expand All @@ -90,7 +90,7 @@
'words) . font-lock-keyword-face)
;; Function Application
`(,(regexp-opt '("apply" "partial_apply" "builtin" "try_apply")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)
;; Metatypes
`(,(regexp-opt '("metatype" "value_metatype"
"existential_metatype" "init_existential_metatype")
Expand All @@ -112,7 +112,7 @@
"open_existential_addr"
"init_existential_ref"
"open_existential_ref")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)
;; Unchecked Conversions
`(,(regexp-opt '("upcast"
"address_to_pointer" "pointer_to_address"
Expand All @@ -139,10 +139,10 @@

;; Checked Conversions
`(,(regexp-opt '("unconditional_checked_cast" "unconditional_checked_cast_addr")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)
;; Runtime Failures
`(,(regexp-opt '("cond_fail")
'words) . font-lock-keyword-face)
'words) . font-lock-keyword-face)
;; Terminators
`(,(regexp-opt '("unreachable" "return" "br"
"cond_br" "switch_value" "switch_enum"
Expand Down