Skip to content

Fixed some variables being unnecessarily mutable #4384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2017
Merged

Fixed some variables being unnecessarily mutable #4384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8245234
Fixed variables being unnecessarily mut.
ivanbakel Aug 9, 2017
1486f42
Fixed instance in Windows cfg.
ivanbakel Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/cargo/core/resolver/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1109,7 +1109,7 @@ impl<'a> Context<'a> {
if !used_features.is_empty() {
let pkgid = candidate.package_id();

let mut set = self.resolve_features.entry(pkgid.clone())
let set = self.resolve_features.entry(pkgid.clone())
.or_insert_with(HashSet::new);
for feature in used_features {
if !set.contains(feature) {
Expand Down
2 changes: 1 addition & 1 deletion src/cargo/util/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ impl Config {
format!("failed to load TOML configuration from `{}`", credentials.display())
})?;

let mut cfg = match *cfg {
let cfg = match *cfg {
CV::Table(ref mut map, _) => map,
_ => unreachable!(),
};
Expand Down
4 changes: 2 additions & 2 deletions src/cargo/util/read2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod imp {

pub fn read2(mut out_pipe: ChildStdout,
mut err_pipe: ChildStderr,
mut data: &mut FnMut(bool, &mut Vec<u8>, bool)) -> io::Result<()> {
data: &mut FnMut(bool, &mut Vec<u8>, bool)) -> io::Result<()> {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's one more in #[cfg(windows)].

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alright, fixed.

unsafe {
libc::fcntl(out_pipe.as_raw_fd(), libc::F_SETFL, libc::O_NONBLOCK);
libc::fcntl(err_pipe.as_raw_fd(), libc::F_SETFL, libc::O_NONBLOCK);
Expand Down Expand Up @@ -102,7 +102,7 @@ mod imp {

pub fn read2(out_pipe: ChildStdout,
err_pipe: ChildStderr,
mut data: &mut FnMut(bool, &mut Vec<u8>, bool)) -> io::Result<()> {
data: &mut FnMut(bool, &mut Vec<u8>, bool)) -> io::Result<()> {
let mut out = Vec::new();
let mut err = Vec::new();

Expand Down