aboutsummaryrefslogtreecommitdiff
path: root/filesystems/sandboxfs/files/patch-src_nodes_conv.rs
diff options
context:
space:
mode:
Diffstat (limited to 'filesystems/sandboxfs/files/patch-src_nodes_conv.rs')
-rw-r--r--filesystems/sandboxfs/files/patch-src_nodes_conv.rs41
1 files changed, 41 insertions, 0 deletions
diff --git a/filesystems/sandboxfs/files/patch-src_nodes_conv.rs b/filesystems/sandboxfs/files/patch-src_nodes_conv.rs
new file mode 100644
index 000000000000..949974945d2c
--- /dev/null
+++ b/filesystems/sandboxfs/files/patch-src_nodes_conv.rs
@@ -0,0 +1,41 @@
+Unbreak on i386
+
+error[E0308]: mismatched types
+ --> src/nodes/conv.rs:72:19
+ |
+72 | Timespec::new(val.tv_sec() as sys::time::time_t, usec)
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected i64, found i32
+
+--- src/nodes/conv.rs.orig 2020-04-20 18:46:46 UTC
++++ src/nodes/conv.rs
+@@ -69,7 +69,7 @@ pub fn timeval_to_timespec(val: sys::time::TimeVal) ->
+ } else {
+ val.tv_usec() as i32
+ };
+- Timespec::new(val.tv_sec() as sys::time::time_t, usec)
++ Timespec::new((val.tv_sec() as sys::time::time_t).into(), usec)
+ }
+
+ /// Converts a `sys::time::TimeVal` object into a `sys::time::TimeSpec`.
+@@ -328,6 +328,10 @@ mod tests {
+ // modified and may not be queryable, so stub them out.
+ attr.ctime = BAD_TIME;
+ attr.crtime = BAD_TIME;
++ // Ignore rdev too
++ attr.rdev = 0;
++ // XXX: gid is always 0 when the tests run on tmpfs(5)
++ attr.gid = exp_attr.gid;
+ assert!(fileattrs_eq(&exp_attr, &attr));
+ }
+
+@@ -365,6 +369,10 @@ mod tests {
+ // modified and may not be queryable, so stub them out.
+ attr.ctime = BAD_TIME;
+ attr.crtime = BAD_TIME;
++ // Ignore rdev too
++ attr.rdev = 0;
++ // XXX: gid is always 0 when the tests run on tmpfs(5)
++ attr.gid = exp_attr.gid;
+ assert!(fileattrs_eq(&exp_attr, &attr));
+ }
+