Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: DebuggerContest::load_XXX accepts impl AsRef<Path> instead of &PathBuf #976

Merged
merged 1 commit into from
Feb 11, 2024
Merged

fix: DebuggerContest::load_XXX accepts impl AsRef<Path> instead of &PathBuf #976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 12 additions & 14 deletions debugger/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ use std::{
collections::HashSet,
fs::File,
io::{self, Read},
path::PathBuf,
path::Path,
sync::{
atomic::{AtomicBool, Ordering},
mpsc::SyncSender as Sender,
Expand Down Expand Up @@ -139,7 +139,7 @@ const POISONED_LOCK_PANIC: &str = "poisoned lock";
const CHANNEL_CLOSED_PANIC: &str = "channel closed";

impl DebuggerContext {
fn file_to_string(path: &PathBuf) -> Result<String, DebuggerError> {
fn file_to_string(path: impl AsRef<Path>) -> Result<String, DebuggerError> {
let mut file = File::open(path)?;

let mut string = String::new();
Expand All @@ -149,10 +149,11 @@ impl DebuggerContext {
}

/// Loads a grammar from a file.
pub fn load_grammar(&mut self, path: &PathBuf) -> Result<(), DebuggerError> {
let grammar = DebuggerContext::file_to_string(path)?;
pub fn load_grammar(&mut self, path: impl AsRef<Path>) -> Result<(), DebuggerError> {
let grammar = DebuggerContext::file_to_string(&path)?;

let file_name = path
.as_ref()
.file_name()
.map(|string| string.to_string_lossy().into_owned())
.ok_or(DebuggerError::MissingFilename)?;
Expand All @@ -174,7 +175,7 @@ impl DebuggerContext {
}

/// Loads a parsing input from a file.
pub fn load_input(&mut self, path: &PathBuf) -> Result<(), DebuggerError> {
pub fn load_input(&mut self, path: impl AsRef<Path>) -> Result<(), DebuggerError> {
let input = DebuggerContext::file_to_string(path)?;

self.input = Some(input);
Expand Down Expand Up @@ -448,24 +449,21 @@ mod test {
pub fn test_errors() {
let mut context = DebuggerContext::default();

assert!(context.load_input(&PathBuf::from(".")).is_err());
let pest_readme = PathBuf::from(concat!(env!("CARGO_MANIFEST_DIR"), "/../README.md"));
let pest_grammar = PathBuf::from(concat!(
env!("CARGO_MANIFEST_DIR"),
"/../meta/src/grammar.pest"
));
assert!(context.load_input(".").is_err());
let pest_readme = concat!(env!("CARGO_MANIFEST_DIR"), "/../README.md");
let pest_grammar = concat!(env!("CARGO_MANIFEST_DIR"), "/../meta/src/grammar.pest");

assert!(context.load_grammar(&pest_readme).is_err());
assert!(context.load_grammar(pest_readme).is_err());
assert!(context.add_all_rules_breakpoints().is_err());
assert!(context.cont().is_err());
assert!(context.run("rule", sync_channel(1).0).is_err());
assert!(context.load_grammar(&pest_grammar).is_ok());
assert!(context.load_grammar(pest_grammar).is_ok());
assert!(context.run("rule", sync_channel(1).0).is_err());
assert!(context.get_position(0).is_err());
context.load_input_direct("".to_owned());
assert!(context.get_position(0).is_ok());
assert!(context.get_position(1).is_err());
assert!(context.load_input(&pest_grammar).is_ok());
assert!(context.load_input(pest_grammar).is_ok());
let (sender, _receiver) = sync_channel(1);
assert!(context.run("ANY", sender).is_ok());
while context.cont().is_ok() {}
Expand Down
Loading