Skip to content
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.

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

upgrade rust dependencies #4270

Merged
merged 4 commits into from Mar 7, 2020
Merged

upgrade rust dependencies #4270

merged 4 commits into from Mar 7, 2020

Conversation

ry
Copy link
Member

@ry ry commented Mar 6, 2020

No description provided.

@ry ry requested a review from bartlomieju March 6, 2020 18:33
cli/op_error.rs Outdated Show resolved Hide resolved
"matches",
"unicode-bidi",
"unicode-normalization",
]
Copy link
Member Author

Choose a reason for hiding this comment

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

This is caused by sourcemap depending on an old version of the URL crate. I've send a PR upstream: getsentry/rust-sourcemap#26

@ry ry requested a review from piscisaureus March 6, 2020 19:31
@@ -261,11 +261,11 @@ impl From<&ReadlineError> for OpError {
fn from(error: &ReadlineError) -> Self {
use ReadlineError::*;
let kind = match error {
Io(err) => return err.into(),
Io(err) => return OpError::from(err),
Copy link
Member

Choose a reason for hiding this comment

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

What changed? I don't understand how this is different from before.

Copy link
Member Author

Choose a reason for hiding this comment

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

Nothing just sloppy editing

Eof => ErrorKind::UnexpectedEof,
Interrupted => ErrorKind::Interrupted,
#[cfg(unix)]
Errno(err) => return err.into(),
Errno(err) => return (*err).into(),
Copy link
Member

Choose a reason for hiding this comment

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

And here?

Copy link
Member

@piscisaureus piscisaureus left a comment

Choose a reason for hiding this comment

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

LGTM. See ^

@ry ry merged commit 18076db into denoland:master Mar 7, 2020
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 17, 2020
Instead of having these use declarations at the top, I follow the lead of @ry in denoland#4270 (commit b4a6fbb) and move them to the sites where they're used. This helps immensel with refactoring, and also makes it easier to see when/why they're needed.
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 17, 2020
…ented" error

Following the lead of @ry in denoland#4270 (commit b4a6fbb), I wanted to shift from OpError::other("Not implemented") in op_symlink to OpError::not_implemented. But this triggered an awkward cascade having to do with our unsystematic spelling of errors generated in different places. The OpError::not_implemented (following our other Rust errors) is uncapitalized. But then some other errors for Deno.symlink come from cli/js/util.ts: notImplemented(), where the error was capitalized. Changing that to lower case for consistency in the tests (and to keep from having to guess the capitalization depending on the error) required changing the capitalization of checks against the error in cli/js/tests/remove_test.ts and std/fs/ensure_symlink_test.ts.

That's enough to stop this cascade. But really we ought to either: (1) settle on a consistent formatting/spelling scheme for our error messages, whether they come from Rust, or cli/js (or presumably std too). And/or: (2) make the checks against the errors in our tests case-insensitive.
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 17, 2020
…ented" error

Following the lead of @ry in denoland#4270 (commit b4a6fbb), I wanted to shift from OpError::other("Not implemented") in op_symlink to OpError::not_implemented. But this triggered an awkward cascade having to do with our unsystematic spelling of errors generated in different places. The OpError::not_implemented (following our other Rust errors) is uncapitalized. But then some other errors for Deno.symlink come from cli/js/util.ts: notImplemented(), where the error was capitalized. Changing that to lower case for consistency in the tests (and to keep from having to guess the capitalization depending on the error) required changing the capitalization of checks against the error in cli/js/tests/remove_test.ts and std/fs/ensure_symlink_test.ts.

That's enough to stop this cascade. But really we ought to either: (1) settle on a consistent formatting/spelling scheme for our error messages, whether they come from Rust, or cli/js (or presumably std too). And/or: (2) make the checks against the errors in our tests case-insensitive.
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 17, 2020
…ented" error

Following the lead of @ry in denoland#4270 (commit b4a6fbb), I wanted to shift from OpError::other("Not implemented") in op_symlink to OpError::not_implemented. But this triggered an awkward cascade having to do with our unsystematic spelling of errors generated in different places. The OpError::not_implemented (following our other Rust errors) is uncapitalized. But then some other errors for Deno.symlink come from cli/js/util.ts: notImplemented(), where the error was capitalized. Changing that to lower case for consistency in the tests (and to keep from having to guess the capitalization depending on the error) required changing the capitalization of checks against the error in cli/js/tests/remove_test.ts and std/fs/ensure_symlink_test.ts.

That's enough to stop this cascade. But really we ought to either: (1) settle on a consistent formatting/spelling scheme for our error messages, whether they come from Rust, or cli/js (or presumably std too). And/or: (2) make the checks against the errors in our tests case-insensitive.
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 19, 2020
Instead of having these use declarations at the top, I follow the lead of @ry in denoland#4270 (commit b4a6fbb) and move them to the sites where they're used. This helps immensel with refactoring, and also makes it easier to see when/why they're needed.
dubiousjim added a commit to dubiousjim/deno that referenced this pull request Mar 20, 2020
…ented" error

Following the lead of @ry in denoland#4270 (commit b4a6fbb), I wanted to shift from OpError::other("Not implemented") in op_symlink to OpError::not_implemented. But this triggered an awkward cascade having to do with our unsystematic spelling of errors generated in different places. The OpError::not_implemented (following our other Rust errors) is uncapitalized. But then some other errors for Deno.symlink come from cli/js/util.ts: notImplemented(), where the error was capitalized. Changing that to lower case for consistency in the tests (and to keep from having to guess the capitalization depending on the error) required changing the capitalization of checks against the error in cli/js/tests/remove_test.ts and std/fs/ensure_symlink_test.ts.

That's enough to stop this cascade. But really we ought to either: (1) settle on a consistent formatting/spelling scheme for our error messages, whether they come from Rust, or cli/js (or presumably std too). And/or: (2) make the checks against the errors in our tests case-insensitive.
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.

None yet

2 participants