Skip to content

Commit 08b0d52

Browse files
committed
---
yaml --- r: 349464 b: refs/heads/master-next c: 3f4499c h: refs/heads/master
1 parent 7376821 commit 08b0d52

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
3-
refs/heads/master-next: e8f3fa863bf25eeca7844c877a88b05d24146d20
3+
refs/heads/master-next: 3f4499c02da789b25d3bc09906789ca29c6a3537
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
66
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/Sema/CSSimplify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6292,7 +6292,7 @@ ConstraintSystem::simplifyApplicableFnConstraint(
62926292

62936293
// Don't attempt this optimization in "diagnostic mode" because
62946294
// in such mode we'd like to attempt all of the available
6295-
// overloads regardless of of problems related to missing or
6295+
// overloads regardless of problems related to missing or
62966296
// extraneous labels and/or arguments.
62976297
if (!(solverState && shouldAttemptFixes())) {
62986298
// If the right-hand side is a type variable,

branches/master-next/stdlib/public/core/Array.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1421,7 +1421,7 @@ extension Array {
14211421
/// of the new array.
14221422
/// - Parameters:
14231423
/// - buffer: A buffer covering uninitialized memory with room for the
1424-
/// specified number of of elements.
1424+
/// specified number of elements.
14251425
/// - initializedCount: The count of initialized elements in the array,
14261426
/// which begins as zero. Set `initializedCount` to the number of
14271427
/// elements you initialize.

branches/master-next/stdlib/public/core/ContiguousArray.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ extension ContiguousArray {
10061006
/// of the new array.
10071007
/// - Parameters:
10081008
/// - buffer: A buffer covering uninitialized memory with room for the
1009-
/// specified number of of elements.
1009+
/// specified number of elements.
10101010
/// - initializedCount: The count of initialized elements in the array,
10111011
/// which begins as zero. Set `initializedCount` to the number of
10121012
/// elements you initialize.

branches/master-next/utils/api_checker/swift-api-checker.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,11 @@ def prepare_module_list(platform, file, verbose, module_filter_flags,
6868
include_fixed_clang_modules):
6969
cmd = [INFER_IMPORT_PATH, '-s', get_sdk_path(platform)]
7070
cmd.extend(module_filter_flags)
71+
if platform.startswith('iosmac'):
72+
cmd.extend(['--catalyst'])
7173
if verbose:
7274
cmd.extend(['--v'])
73-
check_call(cmd, output=file)
75+
check_call(cmd, verbose=verbose, output=file)
7476
# Always include fixed swift modules
7577
write_fixed_module(file, platform, 'swift', verbose)
7678
# Check if we need fixed clang modules

0 commit comments

Comments
 (0)