Skip to content

Improve error handling & fix clippy lints #32

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

Open
hannahfluch wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve error handling & fix clippy lints #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f2af6
Fix clippy lints
hannahfluch Oct 18, 2024
77dfba1
Improve error handling
hannahfluch Oct 18, 2024
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
8 changes: 5 additions & 3 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ use utf8_chars::BufReadCharsExt;

mod cat;

const UTF_8_REPLACEMENT: char = '\u{FFFD}';

fn main() {
let mut filename: String = "".to_string();
let mut c = parse_cli_args(&mut filename);

if filename == "" {
if filename.is_empty() {
let stdin = io::stdin(); // For lifetime reasons
cat::print_chars_lol(
BufReader::new(stdin.lock()).chars().map(|r| r.unwrap()),
BufReader::new(stdin.lock()).chars().map(|r| r.unwrap_or(UTF_8_REPLACEMENT)),
&mut c,
true,
);
Expand All @@ -32,7 +34,7 @@ fn main() {
fn lolcat_file(filename: &str, c: &mut cat::Control) -> Result<(), io::Error> {
let f = File::open(filename)?;
let file = BufReader::new(&f);
cat::print_lines_lol(file.lines().map(|r| r.unwrap()), c);
cat::print_lines_lol(file.lines().map(|r| r.unwrap_or(UTF_8_REPLACEMENT.to_string())), c);
Ok(())
}

Expand Down