Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 0 additions & 24 deletions Cargo.lock

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

24 changes: 0 additions & 24 deletions external-crates/move/Cargo.lock

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

1 change: 0 additions & 1 deletion external-crates/move/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ insta = "1.42.0"
internment = { version = "0.5.0", features = ["arc"] }
itertools = "0.10.0"
json_comments = "0.2.2"
lazy-regex = "3.4"
leb128 = "0.2.5"
libfuzzer-sys = "0.4"
log = { version = "0.4.14", features = ["serde"] }
Expand Down
1 change: 0 additions & 1 deletion external-crates/move/crates/move-package-alt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ publish = false
[dependencies]
anyhow.workspace = true
derive-where.workspace = true
lazy-regex.workspace = true
serde.workspace = true
serde_spanned.workspace = true
toml.workspace = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use std::{

use anyhow::bail;
use derive_where::derive_where;
use lazy_regex::regex_captures;
use serde::{Deserialize, Serialize};
use serde_spanned::Spanned;
use toml_edit::{
Expand Down Expand Up @@ -231,6 +230,43 @@ fn lockname_to_env_name(filename: OsString) -> Option<String> {
return None;
};

let (_, env_name) = regex_captures!(r"Move\.(.*)\.lock", &filename)?;
Some(env_name.to_string())
let prefix = "Move.";
let suffix = ".lock";

if filename.starts_with(prefix) && filename.ends_with(suffix) {
let start_index = prefix.len();
let end_index = filename.len() - suffix.len();

if start_index < end_index {
return Some(filename[start_index..end_index].to_string());
}
}

None
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_lockname_to_env_name() {
assert_eq!(
lockname_to_env_name(OsString::from("Move.test.lock")),
Some("test".to_string())
);
assert_eq!(
lockname_to_env_name(OsString::from("Move.3vcga23.lock")),
Some("3vcga23".to_string())
);
assert_eq!(
lockname_to_env_name(OsString::from("Mve.test.lock.lock")),
None
);

assert_eq!(lockname_to_env_name(OsString::from("Move.lock")), None);
assert_eq!(lockname_to_env_name(OsString::from("Move.test.loc")), None);
assert_eq!(lockname_to_env_name(OsString::from("Move.testloc")), None);
assert_eq!(lockname_to_env_name(OsString::from("Move.test")), None);
}
}
Loading