Skip to content

[exocrate] Re-export toml_const for parse_remote_archive #3546

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

Open
Sagartaunk wants to merge 1 commit into
base: main
Choose a base branch
from
+142 −10
Open

[exocrate] Re-export toml_const for parse_remote_archive #3546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions anneal/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion anneal/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ url = "https://example.com/macos-aarch64.tar.zst"

[dependencies]
exocrate = { path = "../exocrate" }
toml_const = "1.3.0"
clap = { version = "4.5", features = ["derive"] }
clap-cargo = { version = "0.18.3", features = ["cargo_metadata"] }
env_logger = "0.11"
Expand Down
134 changes: 134 additions & 0 deletions exocrate/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions exocrate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ sha2 = "0.10.9"
sha2-const = "0.1.3"
tar = "0.4.45"
tempfile = "3.27.0"
toml_const = "1.3.1"
ureq = "3.3.0"
zstd = "0.13.3"

Expand Down
6 changes: 2 additions & 4 deletions exocrate/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,17 +365,14 @@ fn install(mut reader: impl Read, dst: &Path, expected_sha256: Option<[u8; 32]>)
/// }
/// ```
///
/// **NOTE**: The calling crate must have its own dependency on the `toml_const`
/// crate.
// - FIXME(#3409): Lift this limitation.
// - FIXME(#3410): Don't require the user to specify os/arch pairs in the macro invocation.
#[macro_export]
macro_rules! parse_remote_archive {
($vis:vis const $name:ident: RemoteArchive = $cargo_toml_path:literal [
$(($os:ident, $arch:ident)),* $(,)?
];) => {
$vis const $name: $crate::RemoteArchive = {
::toml_const::toml_const!{
$crate::macro_util::toml_const::toml_const!{
const MANIFEST: $cargo_toml_path;
}

Expand Down Expand Up @@ -482,6 +479,7 @@ macro_rules! config {
#[doc(hidden)]
pub mod macro_util {
pub use sha2_const::Sha256;
pub use toml_const;

/// Packs the bytes of `s` into a `u128`.
///
Expand Down
Loading