Skip to content

Commit 51b110f

Browse files
authored
Rollup merge of #64288 - guanqun:use-get-toml, r=Mark-Simulacrum
use 'get_toml' instead of regular expression
2 parents 1716678 + 85e09c6 commit 51b110f

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

src/bootstrap/bootstrap.py

+15-5
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,10 @@ def get_toml(self, key, section=None):
523523
'value2'
524524
>>> rb.get_toml('key', 'c') is None
525525
True
526+
527+
>>> rb.config_toml = 'key1 = true'
528+
>>> rb.get_toml("key1")
529+
'true'
526530
"""
527531

528532
cur_section = None
@@ -571,6 +575,12 @@ def get_string(line):
571575
572576
>>> RustBuild.get_string(' "devel" ')
573577
'devel'
578+
>>> RustBuild.get_string(" 'devel' ")
579+
'devel'
580+
>>> RustBuild.get_string('devel') is None
581+
True
582+
>>> RustBuild.get_string(' "devel ')
583+
''
574584
"""
575585
start = line.find('"')
576586
if start != -1:
@@ -822,13 +832,13 @@ def bootstrap(help_triggered):
822832
except (OSError, IOError):
823833
pass
824834

825-
match = re.search(r'\nverbose = (\d+)', build.config_toml)
826-
if match is not None:
827-
build.verbose = max(build.verbose, int(match.group(1)))
835+
config_verbose = build.get_toml('verbose', 'build')
836+
if config_verbose is not None:
837+
build.verbose = max(build.verbose, int(config_verbose))
828838

829-
build.use_vendored_sources = '\nvendor = true' in build.config_toml
839+
build.use_vendored_sources = build.get_toml('vendor', 'build') == 'true'
830840

831-
build.use_locked_deps = '\nlocked-deps = true' in build.config_toml
841+
build.use_locked_deps = build.get_toml('locked-deps', 'build') == 'true'
832842

833843
build.check_vendored_status()
834844

0 commit comments

Comments
 (0)