Skip to content

adding back in cwd, previous commit overwrote it #167

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.

Sign up for GitHub

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 2 commits into from
Mar 16, 2017
Merged

adding back in cwd, previous commit overwrote it #167

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3358179
adding back in cwd, not sure why it was missing (causing OSX to fail)
jasonwilliams Mar 16, 2017
bfb9570
cwd was removed by my previous commit, adding back in
jasonwilliams Mar 16, 2017
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
5 changes: 3 additions & 2 deletions SyntaxCheckPlugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def run_cargo(self, args, cwd):
"""Args should be an array of arguments for cargo.
Returns list of dictionaries of the parsed JSON output.
"""

# When sublime is launched from the dock in OSX, it does not have the user's environment set. So the $PATH env is reset.
# This means ~./cargo/bin won't be added (causing rustup to fail), we can manually add it back in here. [This is a hack, hopefully Sublime fixes this natively]
# fixes https://github.com/rust-lang/sublime-rust/issues/126
Expand All @@ -100,7 +101,7 @@ def run_cargo(self, args, cwd):
print('Running %r' % cmd)
# shell=True is needed to stop the window popping up, although it looks like this is needed:
# http://stackoverflow.com/questions/3390762/how-do-i-eliminate-windows-consoles-from-spawned-processes-in-python-2-7
cproc = subprocess.Popen(cmd,
cproc = subprocess.Popen(cmd, cwd=cwd,
shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, env=env)

output = cproc.communicate()
Expand Down Expand Up @@ -133,7 +134,7 @@ def get_rustc_messages(self, settings, file_name):
if settings.get('rust_syntax_checking_include_tests', True):
if not ('--test' in target_args or '--bench' in target_args):
args.append('--test')
yield (target_src, self.run_cargo(args))
yield (target_src, self.run_cargo(args, cwd))

def determine_targets(self, settings, file_name):
"""Detect the target/filters needed to pass to Cargo to compile
Expand Down