Skip to content

Fixing warnings in rust compile #549

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
sven-oly merged 1 commit into from
Jun 12, 2026
Merged

Fixing warnings in rust compile #549

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
27 changes: 13 additions & 14 deletions executors/rust/src/collator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub fn run_collation_test(json_obj: &Value) -> Result<Value, String> {
let alternate_option: Option<&str> = json_obj["alternate"].as_str();
let case_first_option: Option<&str> = json_obj["caseFirst"].as_str();
let case_level_option: Option<&str> = json_obj["caseLevel"].as_str();
#[cfg(not(any(ver = "1.3", ver = "1.4", ver = "1.5", ver = "2.0-beta1")))]
let numeric_option: Option<&str> = json_obj["numeric"].as_str();
let reorder_option: Option<&str> = json_obj["reorder"].as_str();
let backwards_option: Option<&str> = json_obj["backwards"].as_str();
Expand Down Expand Up @@ -199,23 +200,21 @@ pub fn run_collation_test(json_obj: &Value) -> Result<Value, String> {

// Numeric sort order.
// CollatorPreferences in beta2 vs. Enum Numeric
// !!! TODO: handle before 2.0beta2
#[cfg(not(any(ver = "1.3", ver = "1.4", ver = "1.5", ver = "2.0-beta1")))]
if let Some(numeric) = numeric_option {
#[cfg(not(any(ver = "1.3", ver = "1.4", ver = "1.5", ver = "2.0-beta1")))]
{
preferences.numeric_ordering = match numeric {
"off" => Some(CollationNumericOrdering::False),
"on" => Some(CollationNumericOrdering::True),
_ => {
return Ok(json!({
"label": label,
"error_detail": {"numeric": numeric},
"unsupported": "numeric",
"error_type": "unsupported",
}));
}
preferences.numeric_ordering = match numeric {
"off" => Some(CollationNumericOrdering::False),
"on" => Some(CollationNumericOrdering::True),
_ => {
return Ok(json!({
"label": label,
"error_detail": {"numeric": numeric},
"unsupported": "numeric",
"error_type": "unsupported",
}));
}
};
// !!! TODO: handle before 2.0beta2
};

if let Some(alternate) = alternate_option {
Expand Down
1 change: 1 addition & 0 deletions executors/rust/src/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ macro_rules! as_borrowed_2_0 {
ver = "2.0-beta1",
ver = "2.0-beta2"
))]
#[allow(unused_macros)]
macro_rules! as_borrowed_2_0 {
($expr:expr) => {
$expr
Expand Down
Loading