From 21e07da9f11ad8f7e5d6a3643c84515499cd9c00 Mon Sep 17 00:00:00 2001
From: Xavier L'Heureux <xavier.lheureux@icloud.com>
Date: Mon, 22 Jul 2019 11:07:22 -0400
Subject: [PATCH] rust!: Update the minimal rustc version to 1.35.0
---
.gitlab-ci.yml | 2 +-
Cargo.lock | 1 -
Cargo.toml | 1 -
Makefile | 2 +-
README.md | 6 +++---
src/binary/mod.rs | 3 +--
src/lib/builtins/calc.rs | 2 +-
src/lib/parser/lexers/arguments.rs | 2 +-
src/lib/shell/mod.rs | 27 +++++++++++----------------
src/lib/shell/pipe_exec/fork.rs | 3 ++-
src/lib/shell/pipe_exec/mod.rs | 10 ++++++----
src/lib/shell/pipe_exec/streams.rs | 19 ++++++++++---------
12 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9a728e6b..d3945cd9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ format:
- cargo +nightly fmt --all -- --check
linux:
- image: 'rust:1.32.0'
+ image: 'rust:1.35.0'
script:
- cargo build
- FULL=1 make tests
diff --git a/Cargo.lock b/Cargo.lock
index ceda9c70..4a1a09d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -774,7 +774,6 @@ version = "0.1.0"
name = "ion-shell"
version = "1.0.0-alpha"
dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"auto_enums 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
"builtins-proc 0.1.0",
diff --git a/Cargo.toml b/Cargo.toml
index 523ec16a..f6930338 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -60,7 +60,6 @@ name = "ion"
path = "src/main.rs"
[build-dependencies]
-ansi_term = "0.11"
version_check = "0.9"
[dependencies]
diff --git a/Makefile b/Makefile
index 760807bd..284f218d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
prefix ?= usr/local
BINARY = $(prefix)/bin/ion
RELEASE = debug
-TOOLCHAIN ?= 1.32.0
+TOOLCHAIN ?= 1.35.0
GIT_REVISION=git_revision.txt
SRC=Cargo.toml Cargo.lock $(shell find src members -type f -wholename '*src/*.rs')
diff --git a/README.md b/README.md
index 3c3f4516..e240c74d 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ See the [examples folder](https://gitlab.redox-os.org/redox-os/ion/tree/master/e
## Pop!\_OS / Ubuntu
-The following PPA supports the 18.04 (bionic) and 18.10 (cosmic) releases. Bionic builds were made using the Pop\_OS PPA's rustc 1.32.0 package.
+The following PPA supports the 18.04 (bionic) and 18.10 (cosmic) releases. Bionic builds were made using the Pop\_OS PPA's rustc 1.35.0 package.
```
sudo add-apt-repository ppa:mmstick76/ion-shell
@@ -44,13 +44,13 @@ sudo add-apt-repository ppa:mmstick76/ion-shell
# Developer set up
Those who are developing software with Rust should install the [Rustup toolchain manager](https://rustup.rs/).
-After installing rustup, run `rustup override set 1.32.0` to set your Rust toolchain to the version that Ion is
+After installing rustup, run `rustup override set 1.35.0` to set your Rust toolchain to the version that Ion is
targeting at the moment. To build for Redox OS, `rustup override set nightly` is required to build the Redox
dependencies.
# Build dependencies
-Please ensure that both cargo and rustc 1.32.0 or higher is installed for your system.
+Please ensure that both cargo and rustc 1.35.0 or higher is installed for your system.
Release tarballs have not been made yet due to Ion being incomplete in a few remaining areas.
# Compile instructions for distribution
diff --git a/src/binary/mod.rs b/src/binary/mod.rs
index abdef86d..d287890e 100644
--- a/src/binary/mod.rs
+++ b/src/binary/mod.rs
@@ -292,8 +292,7 @@ impl<'a> InteractiveShell<'a> {
if let Err(err) = io::stderr().flush() {
println!("ion: failed to flush stderr: {}", err);
}
- let mut lines = std::iter::repeat_with(|| self.readln(prep_for_exit))
- .filter_map(|cmd| cmd)
+ let mut lines = std::iter::from_fn(|| self.readln(prep_for_exit))
.flat_map(|s| s.into_bytes().into_iter().chain(Some(b'\n')));
match Terminator::new(&mut lines).terminate() {
Some(command) => {
diff --git a/src/lib/builtins/calc.rs b/src/lib/builtins/calc.rs
index 56170637..bc11a9a4 100644
--- a/src/lib/builtins/calc.rs
+++ b/src/lib/builtins/calc.rs
@@ -62,7 +62,7 @@ pub fn calc(args: &[crate::types::Str], _: &mut crate::Shell<'_>) -> Status {
}
Err(e) => Status::error(format!("{}", e)),
}
- } else if nix::unistd::isatty(nix::libc::STDIN_FILENO).unwrap() {
+ } else if atty::is(atty::Stream::Stdin) {
println!("{}", REPL_GUIDE);
let mut context = Context::new();
loop {
diff --git a/src/lib/parser/lexers/arguments.rs b/src/lib/parser/lexers/arguments.rs
index f6932d31..dd76a367 100644
--- a/src/lib/parser/lexers/arguments.rs
+++ b/src/lib/parser/lexers/arguments.rs
@@ -150,7 +150,7 @@ impl<'a> Iterator for ArgumentSplitter<'a> {
let start = self.read;
let mut levels = Levels::default();
- let mut bytes = data.iter().cloned().skip(self.read);
+ let mut bytes = data.iter().skip(self.read).cloned();
while let Some(character) = bytes.next() {
match character {
// Skip the next byte.
diff --git a/src/lib/shell/mod.rs b/src/lib/shell/mod.rs
index f55354d6..bf0b1629 100644
--- a/src/lib/shell/mod.rs
+++ b/src/lib/shell/mod.rs
@@ -303,22 +303,17 @@ impl<'a> Shell<'a> {
);
for item in &mut pipeline.items {
- // TODO: Once the rust version is shifted to 1.33, use the transpose method
- item.job.stdin = if let Some(file) = &self.stdin {
- Some(file.try_clone().map_err(PipelineError::ClonePipeFailed)?)
- } else {
- None
- };
- item.job.stdout = if let Some(file) = &stdout {
- Some(file.try_clone().map_err(PipelineError::ClonePipeFailed)?)
- } else {
- None
- };
- item.job.stderr = if let Some(file) = &stderr {
- Some(file.try_clone().map_err(PipelineError::ClonePipeFailed)?)
- } else {
- None
- };
+ item.job.stdin = self
+ .stdin
+ .as_ref()
+ .map(|file| file.try_clone().map_err(PipelineError::ClonePipeFailed))
+ .transpose()?;
+ item.job.stdout = stdout
+ .map(|file| file.try_clone().map_err(PipelineError::ClonePipeFailed))
+ .transpose()?;
+ item.job.stderr = stderr
+ .map(|file| file.try_clone().map_err(PipelineError::ClonePipeFailed))
+ .transpose()?;
}
if let Some(ref callback) = self.pre_command {
callback(self, &pipeline);
diff --git a/src/lib/shell/pipe_exec/fork.rs b/src/lib/shell/pipe_exec/fork.rs
index 73cd96b3..0bc534b5 100644
--- a/src/lib/shell/pipe_exec/fork.rs
+++ b/src/lib/shell/pipe_exec/fork.rs
@@ -8,6 +8,7 @@ use nix::{
sys::signal::{self, SigHandler, Signal},
unistd::{self, ForkResult, Pid},
};
+use std::{io, os::unix::io::AsRawFd};
impl<'a> Shell<'a> {
/// Ensures that the forked child is given a unique process ID.
@@ -28,7 +29,7 @@ impl<'a> Shell<'a> {
signal::signal(Signal::SIGHUP, SigHandler::SigDfl).unwrap();
signal::signal(Signal::SIGTERM, SigHandler::SigDfl).unwrap();
}
- unistd::close(nix::libc::STDIN_FILENO).unwrap();
+ unistd::close(io::stdin().as_raw_fd()).unwrap();
// This ensures that the child fork has a unique PGID.
Self::create_process_group();
diff --git a/src/lib/shell/pipe_exec/mod.rs b/src/lib/shell/pipe_exec/mod.rs
index 7a8213eb..b2430a5a 100644
--- a/src/lib/shell/pipe_exec/mod.rs
+++ b/src/lib/shell/pipe_exec/mod.rs
@@ -519,10 +519,12 @@ fn spawn_proc(
command.stderr(stderr.map_or_else(Stdio::inherit, Into::into));
let grp = *group;
- command.before_exec(move || {
- let _ = unistd::setpgid(Pid::this(), grp.unwrap_or_else(Pid::this));
- Ok(())
- });
+ unsafe {
+ command.pre_exec(move || {
+ let _ = unistd::setpgid(Pid::this(), grp.unwrap_or_else(Pid::this));
+ Ok(())
+ })
+ };
match command.spawn() {
Ok(child) => Ok(Pid::from_raw(child.id() as i32)),
Err(err) => {
diff --git a/src/lib/shell/pipe_exec/streams.rs b/src/lib/shell/pipe_exec/streams.rs
index 1194bfeb..407b033f 100644
--- a/src/lib/shell/pipe_exec/streams.rs
+++ b/src/lib/shell/pipe_exec/streams.rs
@@ -2,13 +2,14 @@ use crate::PipelineError;
use nix::unistd;
use std::{
fs::File,
- os::unix::io::{AsRawFd, FromRawFd, RawFd},
+ io,
+ os::unix::io::{AsRawFd, FromRawFd},
};
/// Use dup2 to replace `old` with `new` using `old`s file descriptor ID
-fn redir(old: &Option<File>, new: RawFd) -> Result<(), PipelineError> {
+fn redir<F: AsRawFd>(old: &Option<File>, new: &F) -> Result<(), PipelineError> {
if let Some(old) = old.as_ref().map(AsRawFd::as_raw_fd) {
- unistd::dup2(old, new).map_err(PipelineError::CloneFdFailed)?;
+ unistd::dup2(old, new.as_raw_fd()).map_err(PipelineError::CloneFdFailed)?;
}
Ok(())
}
@@ -19,10 +20,10 @@ fn redir(old: &Option<File>, new: RawFd) -> Result<(), PipelineError> {
pub fn duplicate() -> nix::Result<(Option<File>, File, File)> {
// STDIN may have been closed for a background shell, so it is ok if it cannot be duplicated.
let stdin =
- unistd::dup(nix::libc::STDIN_FILENO).ok().map(|fd| unsafe { File::from_raw_fd(fd) });
+ unistd::dup(io::stdin().as_raw_fd()).ok().map(|fd| unsafe { File::from_raw_fd(fd) });
- let stdout = unsafe { File::from_raw_fd(unistd::dup(nix::libc::STDOUT_FILENO)?) };
- let stderr = unsafe { File::from_raw_fd(unistd::dup(nix::libc::STDERR_FILENO)?) };
+ let stdout = unsafe { File::from_raw_fd(unistd::dup(io::stdout().as_raw_fd())?) };
+ let stderr = unsafe { File::from_raw_fd(unistd::dup(io::stderr().as_raw_fd())?) };
// And then meld stderr alongside stdin and stdout
Ok((stdin, stdout, stderr))
}
@@ -33,7 +34,7 @@ pub fn redirect(
out: &Option<File>,
err: &Option<File>,
) -> Result<(), PipelineError> {
- redir(inp, nix::libc::STDIN_FILENO)?;
- redir(out, nix::libc::STDOUT_FILENO)?;
- redir(err, nix::libc::STDERR_FILENO)
+ redir(inp, &io::stdin())?;
+ redir(out, &io::stdout())?;
+ redir(err, &io::stderr())
}
--
GitLab