Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-06-02 15:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

Change function name, comments, and error message

Browse Source
This commit is contained in:
David Cook
2020-01-28 19:43:55 -06:00
parent 90f3aae2de
commit d8da3968d6
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shims/fs.rs
+14 -8
View File
@@ -347,7 +347,7 @@ fn fstat(
Some(metadata) => metadata,
None => return Ok(-1),
};
stat_write_buf(this, metadata, buf_op)
stat_macos_write_buf(this, metadata, buf_op)
}
fn stat_or_lstat(
@@ -369,7 +369,7 @@ fn stat_or_lstat(
Some(metadata) => metadata,
None => return Ok(-1),
};
stat_write_buf(this, metadata, buf_op)
stat_macos_write_buf(this, metadata, buf_op)
}
fn statx(
@@ -427,17 +427,23 @@ fn statx(
this.read_scalar(dirfd_op)?.to_machine_isize(&*this.tcx)?.try_into().map_err(|e| {
err_unsup_format!("Failed to convert pointer sized operand to integer: {}", e)
})?;
// we only support interpreting `path` as an absolute directory or as a directory relative
// to `dirfd` when the latter is `AT_FDCWD`. The behavior of `statx` with a relative path
// and a directory file descriptor other than `AT_FDCWD` is specified but it cannot be
// tested from `libstd`. If you found this error, please open an issue reporting it.
// We only support:
// * interpreting `path` as an absolute directory,
// * interpreting `path` as a path relative to `dirfd` when the latter is `AT_FDCWD`, or
// * interpreting `dirfd` as any file descriptor when `path` is empty and AT_EMPTY_PATH is
// set.
// The behavior of `statx` with a relative path and a directory file descriptor other than
// `AT_FDCWD` is specified but it cannot be tested from `libstd`. If you found this error,
// please open an issue reporting it.
if !(
path.is_absolute() ||
dirfd == this.eval_libc_i32("AT_FDCWD")? ||
(path.as_os_str().is_empty() && empty_path_flag)
) {
throw_unsup_format!(
"Using statx with a relative path and a file descriptor different from `AT_FDCWD` is not supported"
"Using statx is only supported with absolute paths, relative paths with the file \
descriptor `AT_FDCWD`, and empty paths with the `AT_EMPTY_PATH` flag set and any \
file descriptor"
)
}
@@ -631,7 +637,7 @@ fn from_meta<'tcx, 'mir>(
}
}
fn stat_write_buf<'tcx, 'mir>(
fn stat_macos_write_buf<'tcx, 'mir>(
ecx: &mut MiriEvalContext<'mir, 'tcx>,
metadata: FileMetadata,
buf_op: OpTy<'tcx, Tag>,