Skip to content

Commit

Permalink
Upgrade to Rust v1.49.0 again (#11453)
Browse files Browse the repository at this point in the history
This is necessary to compile the engine on Mac Silicon.

We can now safely upgrade thanks to #11452 fixing the issue with macOS.
  • Loading branch information
Eric-Arellano committed Jan 13, 2021
1 parent 24c57c0 commit d37f4bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[toolchain]
channel = "1.48.0"
channel = "1.49.0"
components = [
"cargo",
"clippy",
Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/process_execution/src/remote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ pub fn extract_output_files(

let mut digest = root_digest;

if dir.path != "" {
if !dir.path.is_empty() {
for component in dir.path.rsplit('/') {
let component = component.to_owned();
let directory = remexec::Directory {
Expand Down
2 changes: 1 addition & 1 deletion src/rust/engine/src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl<'x> Params {
.binary_search_by(|probe| probe.type_id().cmp(&type_id))
}

pub fn type_ids<'a>(&'a self) -> impl Iterator<Item = TypeId> + 'a {
pub fn type_ids(&self) -> impl Iterator<Item = TypeId> + '_ {
self.0.iter().map(|k| *k.type_id())
}
}
Expand Down

0 comments on commit d37f4bd

Please sign in to comment.