diff options
| author | har7an <99636919+har7an@users.noreply.github.com> | 2023-05-09 02:43:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-09 02:43:28 +0000 |
| commit | 30d0cffa4294b27da88253b5fb24b40044310338 (patch) | |
| tree | 66e9cbb833571aee022d5739451e0925c32aeefb /src | |
| parent | docs(changelog): fix FreeBSD sticky bit crash (diff) | |
| download | sl0ppij-30d0cffa4294b27da88253b5fb24b40044310338.tar.gz sl0ppij-30d0cffa4294b27da88253b5fb24b40044310338.tar.xz sl0ppij-30d0cffa4294b27da88253b5fb24b40044310338.zip | |
Use rust 1.67 (#2375)
* rust: Update toolchain version to 1.67
* xtask/pipeline/publish: Drop manual "wait"
for crates.io to catch up, which is obsolete with rust 1.66 and up.
Cargo does that on its own now. See
https://github.com/rust-lang/cargo/pull/11062
* xtask: Add function to obtain asset_dir
instead of assembling it on demand throughout the codebase.
* xtask/run: Add '--quick-run' flag
as a convenient shorthand for `cargo xtask run --data-dir
$PROJECT_ROOT/zellij-utils/assets`.
* cargo: Add 'q' command alias
as a shorthand for 'cargo xtask run --quick-run'
* cargo: Update thiserror to 1.0.40
* cargo: Update anyhow to 1.0.70
and specify dependency only once inside `zellij-utils`, not inside the
zellij root crate.
* cargo: Update names to 0.14.0
* cargo: Update miette to 5.7.0
and re-export the dependency from zellij-utils, to avoid duplicate
(incompatible) includes from inside zellij-utils and the root crate.
* cargo: Update dialoguer to 0.10.4
* fix formatting
* changelog: Add PR #2375
Diffstat (limited to 'src')
| -rw-r--r-- | src/commands.rs | 2 | ||||
| -rw-r--r-- | src/sessions.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/commands.rs b/src/commands.rs index 0394a934..697f7057 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -1,5 +1,4 @@ use dialoguer::Confirm; -use miette::{Report, Result}; use std::{fs::File, io::prelude::*, path::PathBuf, process}; use crate::sessions::{ @@ -23,6 +22,7 @@ use zellij_utils::{ config::{Config, ConfigError}, options::Options, }, + miette::{Report, Result}, nix, setup::Setup, }; diff --git a/src/sessions.rs b/src/sessions.rs index 5f3354de..9c7de37e 100644 --- a/src/sessions.rs +++ b/src/sessions.rs @@ -3,6 +3,7 @@ use std::time::SystemTime; use std::{fs, io, process}; use suggest::Suggest; use zellij_utils::{ + anyhow, consts::ZELLIJ_SOCK_DIR, envs, interprocess::local_socket::LocalSocketStream, |