Resolve several warnings

* Removed a couple of unused variables * Removed settings specifications whenever possible, to use default values * Set ALWAYS_SEARCH_USER_PATHS to NO, as it is now deprecated. * Applied the recommended settings for warnings, except for implicit casts to (u)int 32bit values. The reason is these come from the iterator implemented in the BBEdit official header.
Upgrade to build on MacOS X 10.14
2019-02-27 11:48:08 +01:00 · 2019-02-27 11:48:08 +01:00
8 changed files with 351 additions and 336 deletions
--- a/Modules/Rust.bblm/Contents/Info.plist
+++ b/Modules/Rust.bblm/Contents/Info.plist
@@ -1,277 +1,224 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <dict>
-        <key>BuildMachineOSBuild</key>
-        <string>15B42</string>
-
-        <key>CFBundleDevelopmentRegion</key>
-        <string>English</string>
-
-        <key>CFBundleExecutable</key>
-        <string>Rust</string>
-
-        <key>CFBundleIdentifier</key>
-        <string>me.bsago.bblm.rust</string>
-
-        <key>CFBundleInfoDictionaryVersion</key>
-        <string>6.0</string>
-
-        <key>CFBundlePackageType</key>
-        <string>BNDL</string>
-
-        <key>CFBundleSignature</key>
-        <string>BBLM</string>
-
-        <key>CFBundleSupportedPlatforms</key>
-        <array>
-            <string>MacOSX</string>
-        </array>
-
-        <key>CFBundleVersion</key>
-        <string>8.0</string>
-
-        <key>CSResourcesFileMapped</key>
-        <true/>
-
-        <key>DTCompiler</key>
-        <string>com.apple.compilers.llvm.clang.1_0</string>
-
-        <key>DTPlatformBuild</key>
-        <string>7B91b</string>
-
-        <key>DTPlatformVersion</key>
-        <string>GM</string>
-
-        <key>DTSDKBuild</key>
-        <string>15A278</string>
-
-        <key>DTSDKName</key>
-        <string>macosx10.11</string>
-
-        <key>DTXcode</key>
-        <string>0710</string>
-
-        <key>DTXcodeBuild</key>
-        <string>7B91b</string>
-
-        <key>com.barebones.bblminfo</key>
-        <array>
-            <dict>
-                <key>BBLMCanGuessLanguage</key>
-                <true/>
-
-                <key>BBLMColorsSyntax</key>
-                <true/>
-
-                <key>BBLMCommentLineDefault</key>
-                <string>// </string>
-
-                <key>BBLMCommentPrefixDefault</key>
-                <string>/* </string>
-
-                <key>BBLMCommentSuffixDefault</key>
-                <string> */</string>
-
-                <key>BBLMDroppedFilePathStyle</key>
-                <string>POSIX</string>
-
-                <key>BBLMEntryPointName</key>
-                <string>rustMain</string>
-
-                <key>BBLMFunctionScannerDoesFoldsToo</key>
-                <true/>
-
-                <key>BBLMIsCaseSensitive</key>
-                <true/>
-
-                <key>BBLMKeywords</key>
-                <array>
-                    <dict>
-                        <key>Keywords</key>
-                        <array>
-                            <string>abstract</string>
-                            <string>alignof</string>
-                            <string>as</string>
-                            <string>become</string>
-                            <string>box</string>
-                            <string>break</string>
-                            <string>const</string>
-                            <string>continue</string>
-                            <string>crate</string>
-                            <string>do</string>
-                            <string>else</string>
-                            <string>enum</string>
-                            <string>extern</string>
-                            <string>false</string>
-                            <string>final</string>
-                            <string>fn</string>
-                            <string>for</string>
-                            <string>if</string>
-                            <string>impl</string>
-                            <string>in</string>
-                            <string>let</string>
-                            <string>loop</string>
-                            <string>macro</string>
-                            <string>macro_rules</string>
-                            <string>match</string>
-                            <string>mod</string>
-                            <string>move</string>
-                            <string>mut</string>
-                            <string>offsetof</string>
-                            <string>override</string>
-                            <string>priv</string>
-                            <string>proc</string>
-                            <string>pub</string>
-                            <string>pure</string>
-                            <string>ref</string>
-                            <string>return</string>
-                            <string>self</string>
-                            <string>sizeof</string>
-                            <string>static</string>
-                            <string>struct</string>
-                            <string>super</string>
-                            <string>trait</string>
-                            <string>true</string>
-                            <string>type</string>
-                            <string>typeof</string>
-                            <string>unsafe</string>
-                            <string>unsized</string>
-                            <string>use</string>
-                            <string>virtual</string>
-                            <string>where</string>
-                            <string>while</string>
-                            <string>yield</string>
-                        </array>
-
-                        <key>RunKind</key>
-                        <string>com.barebones.bblm.keyword</string>
-                    </dict>
-
-                    <dict>
-                        <key>Keywords</key>
-                        <array>
-                            <string>blkcnt_t</string>
-                            <string>blksize_t</string>
-                            <string>bool</string>
-                            <string>c_char</string>
-                            <string>c_double</string>
-                            <string>c_float</string>
-                            <string>c_int</string>
-                            <string>c_long</string>
-                            <string>c_schar</string>
-                            <string>c_short</string>
-                            <string>c_uchar</string>
-                            <string>c_uint</string>
-                            <string>c_ulong</string>
-                            <string>c_ushort</string>
-                            <string>char</string>
-                            <string>clock_t</string>
-                            <string>dev_t</string>
-                            <string>f32</string>
-                            <string>f64</string>
-                            <string>float</string>
-                            <string>gid_t</string>
-                            <string>i16</string>
-                            <string>i32</string>
-                            <string>i64</string>
-                            <string>i8</string>
-                            <string>ino_t</string>
-                            <string>isize</string>
-                            <string>mode_t</string>
-                            <string>nlink_t</string>
-                            <string>off_t</string>
-                            <string>pid_t</string>
-                            <string>ptrdiff_t</string>
-                            <string>size_t</string>
-                            <string>str</string>
-                            <string>suseconds_t</string>
-                            <string>time_t</string>
-                            <string>u16</string>
-                            <string>u32</string>
-                            <string>u64</string>
-                            <string>u8</string>
-                            <string>uid_t</string>
-                            <string>usize</string>
-                            <string>wchar_t</string>
-                        </array>
-
-                        <key>RunKind</key>
-                        <string>com.barebones.bblm.predefined-symbol</string>
-                    </dict>
-                </array>
-
-                <key>BBLMLanguageCode</key>
-                <string>Rust</string>
-
-                <key>BBLMLanguageDisplayName</key>
-                <string>Rust</string>
-
-                <key>BBLMNonSpellableRunKinds</key>
-                <array>
-                    <string>com.barebones.bblm.code</string>
-                    <string>com.barebones.bblm.double-string</string>
-                </array>
-
-                <key>BBLMRunColors</key>
-                <dict>
-                    <key>me.bsago.bblm.rust.function</key>
-                    <string>rgb(219, 135, 2)</string>
-
-                    <key>me.bsago.bblm.rust.identifier</key>
-                    <string>rgb(61, 153, 112)</string>
-
-                    <key>me.bsago.bblm.rust.lifetime</key>
-                    <string>rgb(133, 20, 75)</string>
-
-                    <key>me.bsago.bblm.rust.module</key>
-                    <string>rgb(135, 2, 219)</string>
-                </dict>
-
-                <key>BBLMRunNames</key>
-                <dict>
-                    <key>me.bsago.bblm.rust.function</key>
-                    <string>fn functionname</string>
-
-                    <key>me.bsago.bblm.rust.identifier</key>
-                    <string>Identifier</string>
-
-                    <key>me.bsago.bblm.rust.lifetime</key>
-                    <string>'lifetime</string>
-
-                    <key>me.bsago.bblm.rust.module</key>
-                    <string>mod modulename</string>
-                </dict>
-
-                <key>BBLMScansFunctions</key>
-                <true/>
-
-                <key>BBLMSpellableRunKinds</key>
-                <array>
-                    <string>com.barebones.bblm.line-comment</string>
-                    <string>com.barebones.bblm.block-comment</string>
-                </array>
-
-                <key>BBLMReferenceSearchURLTemplate</key>
-                <string>https://doc.rust-lang.org/std/?search=__SYMBOLNAME__</string>
-
-                <key>BBLMSuffixMap</key>
-                <array>
-                    <dict>
-                        <key>BBLMLanguageSuffix</key>
-                        <string>.rs</string>
-
-                        <key>BBLMIsSourceKind</key>
-                        <true/>
-
-                        <key>BBLMIsHeaderKind</key>
-                        <false/>
-                    </dict>
-                </array>
-
-                <key>BBLMUseHTMLFileSearchRules</key>
-                <false/>
-            </dict>
-        </array>
-    </dict>
+<dict>
+	<key>BuildMachineOSBuild</key>
+	<string>18D109</string>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Rust</string>
+	<key>CFBundleIdentifier</key>
+	<string>me.bsago.bblm.rust</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleSignature</key>
+	<string>BBLM</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+	<key>CFBundleVersion</key>
+	<string>8.0</string>
+	<key>CSResourcesFileMapped</key>
+	<true/>
+	<key>DTCompiler</key>
+	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>DTPlatformBuild</key>
+	<string>10B61</string>
+	<key>DTPlatformVersion</key>
+	<string>GM</string>
+	<key>DTSDKBuild</key>
+	<string>18B71</string>
+	<key>DTSDKName</key>
+	<string>macosx10.14</string>
+	<key>DTXcode</key>
+	<string>1010</string>
+	<key>DTXcodeBuild</key>
+	<string>10B61</string>
+	<key>com.barebones.bblminfo</key>
+	<array>
+		<dict>
+			<key>BBLMCanGuessLanguage</key>
+			<true/>
+			<key>BBLMColorsSyntax</key>
+			<true/>
+			<key>BBLMCommentLineDefault</key>
+			<string>// </string>
+			<key>BBLMCommentPrefixDefault</key>
+			<string>/* </string>
+			<key>BBLMCommentSuffixDefault</key>
+			<string> */</string>
+			<key>BBLMDroppedFilePathStyle</key>
+			<string>POSIX</string>
+			<key>BBLMEntryPointName</key>
+			<string>rustMain</string>
+			<key>BBLMFunctionScannerDoesFoldsToo</key>
+			<true/>
+			<key>BBLMIsCaseSensitive</key>
+			<true/>
+			<key>BBLMKeywords</key>
+			<array>
+				<dict>
+					<key>Keywords</key>
+					<array>
+						<string>abstract</string>
+						<string>alignof</string>
+						<string>as</string>
+						<string>become</string>
+						<string>box</string>
+						<string>break</string>
+						<string>const</string>
+						<string>continue</string>
+						<string>crate</string>
+						<string>do</string>
+						<string>else</string>
+						<string>enum</string>
+						<string>extern</string>
+						<string>false</string>
+						<string>final</string>
+						<string>fn</string>
+						<string>for</string>
+						<string>if</string>
+						<string>impl</string>
+						<string>in</string>
+						<string>let</string>
+						<string>loop</string>
+						<string>macro</string>
+						<string>macro_rules</string>
+						<string>match</string>
+						<string>mod</string>
+						<string>move</string>
+						<string>mut</string>
+						<string>offsetof</string>
+						<string>override</string>
+						<string>priv</string>
+						<string>proc</string>
+						<string>pub</string>
+						<string>pure</string>
+						<string>ref</string>
+						<string>return</string>
+						<string>self</string>
+						<string>sizeof</string>
+						<string>static</string>
+						<string>struct</string>
+						<string>super</string>
+						<string>trait</string>
+						<string>true</string>
+						<string>type</string>
+						<string>typeof</string>
+						<string>unsafe</string>
+						<string>unsized</string>
+						<string>use</string>
+						<string>virtual</string>
+						<string>where</string>
+						<string>while</string>
+						<string>yield</string>
+					</array>
+					<key>RunKind</key>
+					<string>com.barebones.bblm.keyword</string>
+				</dict>
+				<dict>
+					<key>Keywords</key>
+					<array>
+						<string>blkcnt_t</string>
+						<string>blksize_t</string>
+						<string>bool</string>
+						<string>c_char</string>
+						<string>c_double</string>
+						<string>c_float</string>
+						<string>c_int</string>
+						<string>c_long</string>
+						<string>c_schar</string>
+						<string>c_short</string>
+						<string>c_uchar</string>
+						<string>c_uint</string>
+						<string>c_ulong</string>
+						<string>c_ushort</string>
+						<string>char</string>
+						<string>clock_t</string>
+						<string>dev_t</string>
+						<string>f32</string>
+						<string>f64</string>
+						<string>float</string>
+						<string>gid_t</string>
+						<string>i16</string>
+						<string>i32</string>
+						<string>i64</string>
+						<string>i8</string>
+						<string>ino_t</string>
+						<string>isize</string>
+						<string>mode_t</string>
+						<string>nlink_t</string>
+						<string>off_t</string>
+						<string>pid_t</string>
+						<string>ptrdiff_t</string>
+						<string>size_t</string>
+						<string>str</string>
+						<string>suseconds_t</string>
+						<string>time_t</string>
+						<string>u16</string>
+						<string>u32</string>
+						<string>u64</string>
+						<string>u8</string>
+						<string>uid_t</string>
+						<string>usize</string>
+						<string>wchar_t</string>
+					</array>
+					<key>RunKind</key>
+					<string>com.barebones.bblm.predefined-symbol</string>
+				</dict>
+			</array>
+			<key>BBLMLanguageCode</key>
+			<string>Rust</string>
+			<key>BBLMLanguageDisplayName</key>
+			<string>Rust</string>
+			<key>BBLMNonSpellableRunKinds</key>
+			<array>
+				<string>com.barebones.bblm.code</string>
+				<string>com.barebones.bblm.double-string</string>
+			</array>
+			<key>BBLMRunColors</key>
+			<dict>
+				<key>me.bsago.bblm.rust.function</key>
+				<string>rgb(219, 135, 2)</string>
+				<key>me.bsago.bblm.rust.identifier</key>
+				<string>rgb(61, 153, 112)</string>
+				<key>me.bsago.bblm.rust.lifetime</key>
+				<string>rgb(133, 20, 75)</string>
+				<key>me.bsago.bblm.rust.module</key>
+				<string>rgb(135, 2, 219)</string>
+			</dict>
+			<key>BBLMRunNames</key>
+			<dict>
+				<key>me.bsago.bblm.rust.function</key>
+				<string>fn functionname</string>
+				<key>me.bsago.bblm.rust.identifier</key>
+				<string>Identifier</string>
+				<key>me.bsago.bblm.rust.lifetime</key>
+				<string>'lifetime</string>
+				<key>me.bsago.bblm.rust.module</key>
+				<string>mod modulename</string>
+			</dict>
+			<key>BBLMScansFunctions</key>
+			<true/>
+			<key>BBLMSpellableRunKinds</key>
+			<array>
+				<string>com.barebones.bblm.line-comment</string>
+				<string>com.barebones.bblm.block-comment</string>
+			</array>
+			<key>BBLMSuffixMap</key>
+			<array>
+				<dict>
+					<key>BBLMLanguageSuffix</key>
+					<string>.rs</string>
+				</dict>
+			</array>
+			<key>BBLMUseHTMLFileSearchRules</key>
+			<false/>
+		</dict>
+	</array>
+</dict>
 </plist>
--- a/Modules/Rust.bblm/Contents/MacOS/Rust
+++ b/Modules/Rust.bblm/Contents/MacOS/Rust
--- a/Contents/Preview
+++ b/Contents/Preview
--- a/Contents/Resources/impl-generator
+++ b/Contents/Resources/impl-generator
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Alternatively, just [download this .zip of the source](https://github.com/ogham/

 ### Compilation

-To compile your own version, you’ll need Xcode, Rust, and Cargo. The default schema outputs a `.bblm`, and comes with a Run build step so you can debug the module while BBEdit is running. You’ll also need the [BBEdit SDK](http://www.barebones.com/support/develop/). The project assumes it’s mounted under `/Volumes/BBEdit SDK`.
+To compile your own version, you’ll need Xcode, Rust, and Cargo. The default schema outputs a `.bblm`, and comes with a Run build step so you can debug the module while BBEdit is running. You’ll also need the [BBEdit SDK](https://github.com/siegel/LanguageModuleSDK). The project assumes it’s available under `${HOME}/Projects/BBEdit/LanguageModuleSDK`.

 Once you’ve got all that set up, simply run `make` and it’ll compile the language module and Rust helper tools for you.

--- a/Rust.xcodeproj/project.pbxproj
+++ b/Rust.xcodeproj/project.pbxproj
@@ -57,7 +57,7 @@
 		089C1669FE841209C02AAC07 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0610;
+				LastUpgradeCheck = 1010;
 			};
 			buildConfigurationList = 2E4F91D10863164B009D6578 /* Build configuration list for PBXProject "Rust" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -91,17 +91,13 @@
 		2E4F91CE0863164B009D6578 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = NO;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_MODE_FLAG = "ug+w,o-w,a+rX";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
 				PRODUCT_NAME = Rust;
-				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
-				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "/Volumes/BBEdit\\ SDK/Interfaces/Language\\ Modules/";
+				USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces";
 				WRAPPER_EXTENSION = bblm;
 			};
 			name = Debug;
@@ -109,17 +105,13 @@
 		2E4F91CF0863164B009D6578 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_OBJC_WEAK = YES;
 				COMBINE_HIDPI_IMAGES = YES;
 				COPY_PHASE_STRIP = YES;
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_MODE_FLAG = "ug+w,o-w,a+rX";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "";
 				PRODUCT_NAME = Rust;
-				SCAN_ALL_SOURCE_FILES_FOR_INCLUDES = YES;
-				SDKROOT = macosx;
-				USER_HEADER_SEARCH_PATHS = "/Volumes/BBEdit\\ SDK/Interfaces/Language\\ Modules/";
+				USER_HEADER_SEARCH_PATHS = "${HOME}/Projects/BBEdit/LanguageModuleSDK/Interfaces";
 				WRAPPER_EXTENSION = bblm;
 			};
 			name = Release;
@@ -127,23 +119,65 @@
 		2E4F91D20863164B009D6578 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = macosx10.10;
-				VALID_ARCHS = i386;
 			};
 			name = Debug;
 		};
 		2E4F91D30863164B009D6578 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_TREAT_WARNINGS_AS_ERRORS = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
-				SDKROOT = macosx10.10;
-				VALID_ARCHS = i386;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
 			};
 			name = Release;
 		};
--- a/helper-tool/Cargo.lock
+++ b/helper-tool/Cargo.lock
@@ -1,83 +1,103 @@
-[root]
-name = "rust-bbedit-helpers"
-version = "0.1.0"
-dependencies = [
- "hoedown 3.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "advapi32-sys"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "aho-corasick"
-version = "0.3.0"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "bitflags"
-version = "0.3.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "gcc"
-version = "0.3.20"
+version = "0.3.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]

 [[package]]
 name = "hoedown"
-version = "3.0.3"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "gcc 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "kernel32-sys"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "libc"
-version = "0.1.8"
+version = "0.2.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "memchr"
-version = "0.1.3"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex"
-version = "0.1.41"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "aho-corasick 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
+ "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

 [[package]]
 name = "regex-syntax"
-version = "0.2.0"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
+[[package]]
+name = "rust-bbedit-helpers"
+version = "0.1.0"
+dependencies = [
+ "hoedown 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread-id"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "thread_local"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "utf8-ranges"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "winapi"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
@@ -85,3 +105,18 @@ name = "winapi-build"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"

+[metadata]
+"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
+"checksum bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f67931368edf3a9a51d29886d245f1c3db2f1ef0dcc9e35ff70341b78c10d23"
+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2"
+"checksum hoedown 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "be74c44a242d26d26ea3208a78f52fd7e8eea39ab137be4bd67c67439ac7e5a4"
+"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
+"checksum libc 0.2.49 (registry+https://github.com/rust-lang/crates.io-index)" = "413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e"
+"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
+"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
+"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
+"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
+"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
+"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
+"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
+"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
--- a/rust.mm
+++ b/rust.mm
@@ -392,9 +392,9 @@ SInt32 scanForSymbol(BBLMTextIterator &iter,
                     BBLMParamBlock &params,
                     const BBLMCallbackBlock *callbacks)
 {
-    SInt32 whitespaceLen, wordLen = 0, parametersLen = 0;
+    SInt32 whitespaceLen, wordLen = 0;
    UniChar ch;
-    int keywordLen = strlen(keyword);
+    size_t keywordLen = strlen(keyword);

    if (iter.strcmp(keyword, keywordLen) == 0)
    {
@@ -409,7 +409,6 @@ SInt32 scanForSymbol(BBLMTextIterator &iter,
            return 0;
        }

-        SInt32 start_of_name = iter.Offset();
        SInt32 start_of_function;
        while ((ch = iter.GetNextChar()))
        {