Skip to content
Merged
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
2 changes: 1 addition & 1 deletion crates/memofs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -640,7 +640,7 @@ mod test {
let contents = "Lorem ipsum dolor sit amet.".to_string();
let dir = tempfile::tempdir().unwrap();
let file_path = dir.path().join("file.txt");
fs_err::write(&file_path, contents.to_string()).unwrap();
fs_err::write(&file_path, &contents).unwrap();

let vfs = Vfs::new(StdBackend::new().unwrap());
let canonicalized = vfs.canonicalize(&file_path).unwrap();
Expand Down
8 changes: 4 additions & 4 deletions rokit.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tools]
rojo = "rojo-rbx/rojo@7.5.1"
selene = "Kampfkarren/selene@0.29.0"
stylua = "JohnnyMorganz/stylua@2.1.0"
rojo = "rojo-rbx/rojo@7.7.1"
selene = "Kampfkarren/selene@0.32.0"
stylua = "JohnnyMorganz/stylua@2.6.0"
run-in-roblox = "rojo-rbx/run-in-roblox@0.3.0"
lune = "lune-org/lune@0.10.4"
lune = "lune-org/lune@0.11.1"
4 changes: 2 additions & 2 deletions src/cli/sourcemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -325,8 +325,8 @@ mod test {
match value {
Content::Seq(ref mut vec) => {
for path in vec.iter().map(|i| i.as_str().unwrap()) {
assert_eq!(fs_err::canonicalize(path).is_ok(), true, "path was not valid");
assert_eq!(Path::new(path).is_absolute(), true, "path was not absolute");
assert!(fs_err::canonicalize(path).is_ok(), "path was not valid");
assert!(Path::new(path).is_absolute(), "path was not absolute");

paths_count += 1;
}
Expand Down
6 changes: 3 additions & 3 deletions src/snapshot_middleware/csv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ fn sort_localization_entries(mut entries: Vec<LocalizationEntry>) -> Vec<Localiz
a.key
.as_deref()
.unwrap_or_default()
.cmp(&b.key.as_deref().unwrap_or_default())
.cmp(b.key.as_deref().unwrap_or_default())
.then_with(|| {
a.source
.as_deref()
.unwrap_or_default()
.cmp(&b.source.as_deref().unwrap_or_default())
.cmp(b.source.as_deref().unwrap_or_default())
})
});

Expand Down Expand Up @@ -270,7 +270,7 @@ fn convert_localization_csv(contents: &[u8]) -> anyhow::Result<String> {
for record in &records {
let mut entry = LocalizationEntry::default();

for (header, value) in headers.iter().zip(record.into_iter()) {
for (header, value) in headers.iter().zip(record) {
if header.is_empty() || value.is_empty() {
continue;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/rojo_test/internable.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ impl<'a> Internable<&'a HashMap<Ref, Instance<'_>>> for Instance<'a> {

impl Internable<()> for SocketPacket<'_> {
fn intern(&self, redactions: &mut RedactionMap, extra: ()) {
redactions.intern(&self.session_id);
redactions.intern(self.session_id);
match &self.body {
SocketPacketBody::Messages(packet) => packet.intern(redactions, extra),
}
Expand Down
2 changes: 1 addition & 1 deletion tests/rojo_test/syncback_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,5 +112,5 @@ pub fn snapshot_rbxm(name: &str, input: Vec<u8>, file_name: &str) {
name,
rbx_binary::text_format::DecodedModel::from_reader(input.as_slice()),
file_name
)
);
}
Loading