-
Notifications
You must be signed in to change notification settings - Fork 155
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade rust to 1.77.0 nightly - 2024-02-01 (#4022)
* upgrade rust to 1.77.0 nightly - 2024-02-01
- Loading branch information
Showing
12 changed files
with
30 additions
and
18 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
[toolchain] | ||
channel = "nightly-2023-12-21" | ||
channel = "nightly-2024-02-03" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -653,12 +653,14 @@ impl Builder { | |
|
||
let staticlib_target_dir = &self.target_dir; | ||
|
||
// e.g. "mc_foo_enclave_trusted" | ||
let staticlib_crate_name = self.staticlib.workspace_members[0] | ||
.repr | ||
.split_whitespace() | ||
.next() | ||
.ok_or(Error::TrustedCrateName)?; | ||
// The workspace_members IDs have changed to this format: | ||
// path+file:///tmp/mobilenode/consensus/enclave/trusted#[email protected] | ||
// We want to capture everything after the last '#' and before the '@' | ||
let workspace_id = self.staticlib.workspace_members[0].repr.clone(); | ||
let workspace_id_parts: Vec<&str> = workspace_id.split('#').collect(); | ||
let workspace_name = workspace_id_parts[1]; | ||
let workspace_name_parts: Vec<&str> = workspace_name.split('@').collect(); | ||
let staticlib_crate_name = workspace_name_parts[0]; | ||
|
||
// "target/name/<profile>/libmc_foo_enclave_trusted.a" -- not xplatform, but | ||
// neither is our use of SGX, so meh. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters