language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Have Src64::from_file take a &Path

Browse source
This commit is contained in:
Richard Feldman 2023-09-11 17:41:47 -04:00
parent 4d18d625a2
commit 729d5c1882
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/compiler/parse/src/src64.rs
View file

@ -16,8 +16,6 @@ use core::{
ptr::{self, NonNull},
};
use std::fs::File;
#[cfg(not(test))]
/// We store both line and column numbers as u16s, so the largest possible file you could open
/// would be every line having the longest possible column length, or u16::MAX * u16::MAX.
@ -40,6 +38,7 @@ pub enum FileErr {
ReadErr,
FileWasTooBig(usize),
ErrReadingFileSize,
FileOpenFailed,
}
impl<'a> Src64<'a> {
@ -105,9 +104,16 @@ impl<'a> Src64<'a> {
}
#[cfg(any(unix, windows))] // This is not available on wasm32. We could make it work with WASI if desired.
pub fn from_file(arena: &'a Bump, file: File) -> Result<Self, FileErr> {
pub fn from_file(arena: &'a Bump, path: &std::path::Path) -> Result<Self, FileErr> {
use core::ffi::c_void;
let file = match std::fs::File::open(path) {
Ok(file) => file,
Err(_) => {
return Err(FileErr::FileOpenFailed);
}
};
let file_size = match file.metadata() {
Ok(metadata) => {
#[cfg(unix)]
@ -425,9 +431,7 @@ mod src64_tests {
.expect("Failed to write to temp file");
}
let file = File::open(&file_path).expect("Failed to read temp file");
match Src64::from_file(arena, file) {
match Src64::from_file(arena, &file_path) {
Ok(actual) => {
assert_eq!(actual.len() % 64, 0);
assert_eq!(
@ -542,10 +546,9 @@ mod src64_tests {
file.write_all(&bytes).expect("Failed to write to temp file");
}
let file = File::open(&file_path).expect("Failed to read temp file");
let arena = Bump::new();
match Src64::from_file(&arena, file) {
match Src64::from_file(&arena, &file_path) {
Ok(src64) => {
let len = src64.len();