Skip to content

Improved the fix for the continuing problem in the shell#4406

Merged
youknowone merged 5 commits intoRustPython:mainfrom
branai:shell-continuing-fix
Jan 5, 2023
Merged

Improved the fix for the continuing problem in the shell#4406
youknowone merged 5 commits intoRustPython:mainfrom
branai:shell-continuing-fix

Conversation

@branai
Copy link
Copy Markdown
Contributor

@branai branai commented Jan 2, 2023

Improved my fix for #3892

@youknowone
Copy link
Copy Markdown
Member

could you please rebase the commits to remove the merge commit?

when https://github.com/RustPython/RustPython is upstream, git rebase -i upstream/main will work.

@branai
Copy link
Copy Markdown
Contributor Author

branai commented Jan 3, 2023

I added two small changes here to shell.rs, one fixes the issues with comments by checking the location of indentation errors, the other is for other errors.

@DimitrisJim I'd like to fix errors.rs, but I don't understand how to simplify it like you said. Any help you could give would be much appreciated. :)

Copy link
Copy Markdown
Member

@youknowone youknowone left a comment

Choose a reason for hiding this comment

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

looks good. please check the use statement part glitch.

src/shell.rs Outdated
AsObject, PyResult, VirtualMachine,
};

use rustpython_parser::token::Tok;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This line can be a part of line 3.

@youknowone youknowone merged commit 134355e into RustPython:main Jan 5, 2023
@youknowone
Copy link
Copy Markdown
Member

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants