mirror of
https://github.com/nushell/nushell
synced 2024-12-26 04:53:09 +00:00
Update rust-toolchain.toml to 1.67.1 (#9012)
# Description This PR bumps the rust toolchain from 1.66.1 to 1.67.1 # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
parent
5fe0ca418d
commit
ffb9ab9eef
6 changed files with 11 additions and 11 deletions
2
.github/pull_request_template.md
vendored
2
.github/pull_request_template.md
vendored
|
@ -16,7 +16,7 @@ Don't forget to add tests that cover your changes.
|
||||||
Make sure you've run and fixed any issues with these commands:
|
Make sure you've run and fixed any issues with these commands:
|
||||||
|
|
||||||
- `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes)
|
- `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes)
|
||||||
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect` to check that you're using the standard code style
|
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style
|
||||||
- `cargo test --workspace` to check that all tests pass
|
- `cargo test --workspace` to check that all tests pass
|
||||||
- `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library
|
- `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library
|
||||||
|
|
||||||
|
|
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
|
@ -46,7 +46,7 @@ jobs:
|
||||||
run: cargo fmt --all -- --check
|
run: cargo fmt --all -- --check
|
||||||
|
|
||||||
- name: Clippy
|
- name: Clippy
|
||||||
run: cargo clippy --workspace ${{ matrix.flags }}--exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
run: cargo clippy --workspace ${{ matrix.flags }}--exclude nu_plugin_* -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err
|
||||||
|
|
||||||
nu-tests:
|
nu-tests:
|
||||||
env:
|
env:
|
||||||
|
@ -84,7 +84,7 @@ jobs:
|
||||||
|
|
||||||
std-lib-and-python-virtualenv:
|
std-lib-and-python-virtualenv:
|
||||||
env:
|
env:
|
||||||
NU_LOG_LEVEL: DEBUG
|
NU_LOG_LEVEL: DEBUG
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: true
|
fail-fast: true
|
||||||
|
@ -163,7 +163,7 @@ jobs:
|
||||||
uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
|
uses: actions-rust-lang/setup-rust-toolchain@v1.4.4
|
||||||
|
|
||||||
- name: Clippy
|
- name: Clippy
|
||||||
run: cargo clippy --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
run: cargo clippy --package nu_plugin_* ${{ matrix.flags }} -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err
|
||||||
|
|
||||||
- name: Tests
|
- name: Tests
|
||||||
run: cargo test --profile ci --package nu_plugin_*
|
run: cargo test --profile ci --package nu_plugin_*
|
||||||
|
|
|
@ -59,7 +59,7 @@ The most comprehensive test suite we have is the `nu-test-support` crate. For te
|
||||||
- Run Clippy on Nushell:
|
- Run Clippy on Nushell:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err
|
||||||
```
|
```
|
||||||
or via the `toolkit.nu` command:
|
or via the `toolkit.nu` command:
|
||||||
```shell
|
```shell
|
||||||
|
@ -139,7 +139,7 @@ This includes discarded approaches. Also we want to quickly identify regressions
|
||||||
|
|
||||||
### How we merge PRs
|
### How we merge PRs
|
||||||
|
|
||||||
In general the maintainers **squash** all changes of your PR into a single commit when merging.
|
In general the maintainers **squash** all changes of your PR into a single commit when merging.
|
||||||
|
|
||||||
This keeps a clean enough linear history, while not forcing you to conform to a too strict style while iterating in your PR or fixing small problems. As an added benefit the commits on the `main` branch are tied to the discussion that happened in the PR through their `#1234` issue number.
|
This keeps a clean enough linear history, while not forcing you to conform to a too strict style while iterating in your PR or fixing small problems. As an added benefit the commits on the `main` branch are tied to the discussion that happened in the PR through their `#1234` issue number.
|
||||||
|
|
||||||
|
@ -201,13 +201,13 @@ You can help us to make the review process a smooth experience:
|
||||||
- In general, added tests help us to understand which assumptions go into a particular addition/change.
|
- In general, added tests help us to understand which assumptions go into a particular addition/change.
|
||||||
- Try to also test corner cases where those assumptions might break. This can be more valuable than simply adding many similar tests.
|
- Try to also test corner cases where those assumptions might break. This can be more valuable than simply adding many similar tests.
|
||||||
- Commit history inside a PR during code review:
|
- Commit history inside a PR during code review:
|
||||||
- Good **atomic commits** can help follow larger changes, but we are not pedantic.
|
- Good **atomic commits** can help follow larger changes, but we are not pedantic.
|
||||||
- We don't shame fixup commits while you try to figure out a problem. They can help others see what you tried and what didn't work. (see our [squash policy](#how-we-merge-prs))
|
- We don't shame fixup commits while you try to figure out a problem. They can help others see what you tried and what didn't work. (see our [squash policy](#how-we-merge-prs))
|
||||||
- During active review constant **force pushing** just to amend changes can be confusing!
|
- During active review constant **force pushing** just to amend changes can be confusing!
|
||||||
- GitHub's UI presents reviewers with less options to compare diffs
|
- GitHub's UI presents reviewers with less options to compare diffs
|
||||||
- fetched branches for experimentation become invalid!
|
- fetched branches for experimentation become invalid!
|
||||||
- the notification a maintainer receives has a low signal-to-noise ratio
|
- the notification a maintainer receives has a low signal-to-noise ratio
|
||||||
- Git pros *can* use their judgement to rebase/squash to clean up the history *if it aids the understanding* of a larger change during review
|
- Git pros *can* use their judgement to rebase/squash to clean up the history *if it aids the understanding* of a larger change during review
|
||||||
- Merge conflicts:
|
- Merge conflicts:
|
||||||
- In general you should take care of resolving merge conflicts.
|
- In general you should take care of resolving merge conflicts.
|
||||||
- Use your judgement whether to `git merge main` or to `git rebase main`
|
- Use your judgement whether to `git merge main` or to `git rebase main`
|
||||||
|
|
|
@ -564,7 +564,7 @@ fn value_list_to_string(
|
||||||
(buf, TextStyle::default())
|
(buf, TextStyle::default())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn dive_options<'a, 'b>(opts: &'a Options<'b>, span: Span) -> Options<'b> {
|
fn dive_options<'b>(opts: &Options<'b>, span: Span) -> Options<'b> {
|
||||||
let mut opts = opts.clone();
|
let mut opts = opts.clone();
|
||||||
opts.span = span;
|
opts.span = span;
|
||||||
if let Some(deep) = opts.format.expand_limit.as_mut() {
|
if let Some(deep) = opts.format.expand_limit.as_mut() {
|
||||||
|
|
|
@ -16,5 +16,5 @@ profile = "default"
|
||||||
# use in nushell, we may opt to use the bleeding edge stable version of rust.
|
# use in nushell, we may opt to use the bleeding edge stable version of rust.
|
||||||
# I believe rust is on a 6 week release cycle and nushell is on a 3 week release cycle.
|
# I believe rust is on a 6 week release cycle and nushell is on a 3 week release cycle.
|
||||||
# So, every two nushell releases, this version number should be bumped by one.
|
# So, every two nushell releases, this version number should be bumped by one.
|
||||||
channel = "1.66.1"
|
channel = "1.67.1"
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ export def clippy [
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect
|
cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err
|
||||||
} catch {
|
} catch {
|
||||||
error make -u { msg: $"\nplease fix the above ('clippy' | pretty-print-command) errors before continuing!" }
|
error make -u { msg: $"\nplease fix the above ('clippy' | pretty-print-command) errors before continuing!" }
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue