Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-11-10 15:14:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

pin to rust v1.65 (#7249)

Browse source 
# Description

This fixes the compilation problems with `aarch64-apple-darwin` on rust
1.64 as well as the `zstd` problems. We recently found out that `zstd`
pinned to 1.65.



# User-Facing Changes

N/A

# 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

# 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:
Darren Schroeder 2022-11-26 14:26:54 -06:00 committed by GitHub
parent 9850fbd77d
commit a4e11726cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2656,7 +2656,6 @@ dependencies = [
"which", "which",
"windows 0.42.0", "windows 0.42.0",
"winreg", "winreg",
"zstd-sys",
] ]
[[package]] [[package]]

1
crates/nu-command/Cargo.toml
View file

@ -91,7 +91,6 @@ reedline = { version = "0.14.0", features = ["bashisms", "sqlite"]}
wax = { version = "0.5.0" } wax = { version = "0.5.0" }
rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
sqlparser = { version = "0.23.0", features = ["serde"], optional = true } sqlparser = { version = "0.23.0", features = ["serde"], optional = true }
zstd-sys = "=2.0.1+zstd.1.5.2"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]
winreg = "0.10.1" winreg = "0.10.1"

2
crates/nu-command/src/viewers/table.rs
View file

@ -824,7 +824,7 @@ fn convert_to_table(
row.push(value); row.push(value);
} else { } else {
let skip_num = if with_index { 1 } else { 0 }; let skip_num = usize::from(with_index);
for header in data[0].iter().skip(skip_num) { for header in data[0].iter().skip(skip_num) {
let value = let value =
create_table2_entry_basic(item, header.as_ref(), head, config, color_hm); create_table2_entry_basic(item, header.as_ref(), head, config, color_hm);

2
crates/nu-system/src/macos.rs
View file

@ -325,7 +325,7 @@ impl ProcessInfo {
pub fn command(&self) -> String { pub fn command(&self) -> String {
if let Some(path) = &self.curr_path { if let Some(path) = &self.curr_path {
if !path.cmd.is_empty() { if !path.cmd.is_empty() {
path.cmd.join(" ").replace('\n', " ").replace('\t', " ") path.cmd.join(" ").replace(['\n', '\t'], " ")
} else { } else {
String::new() String::new()
} }

2
rust-toolchain.toml
View file

@ -16,4 +16,4 @@ 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.63.0" channel = "1.65.0"