Merge remote-tracking branch 'upstream/master' into readonly

helix-editor · ds-cbo · May 24, 2023 · May 24, 2023 · May 24, 2023 · Jul 10, 2023
commit 8bf96581ddacaeeb9ac4bcbd4641bc079d40bc1e
diff --git a/helix-term/src/args.rs b/helix-term/src/args.rs
@@ -17,6 +17,7 @@ pub struct Args {
  pub log_file: Option<PathBuf>,
  pub config_file: Option<PathBuf>,
  pub files: Vec<(PathBuf, Position)>,
+ pub working_directory: Option<PathBuf>,
  pub readonly: bool,
 }
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.65.0"
+channel = "1.67.0"
 components = ["rustfmt", "rust-src"]