}
}
-pub fn load_string(input: &Path) -> io::Result<Option<String>> {
- let mut f = File::open(input)?;
- let mut d = Vec::new();
- f.read_to_end(&mut d)?;
- Ok(str::from_utf8(&d).map(|s| s.to_string()).ok())
+pub enum LoadStringError {
+ ReadFail,
+ BadUtf8,
}
-macro_rules! load_or_return {
- ($input: expr, $cant_read: expr, $not_utf8: expr) => {
- {
- let input = Path::new(&$input[..]);
- match ::externalfiles::load_string(input) {
- Err(e) => {
- let _ = writeln!(&mut io::stderr(),
- "error reading `{}`: {}", input.display(), e);
- return $cant_read;
- }
- Ok(None) => {
- let _ = writeln!(&mut io::stderr(),
- "error reading `{}`: not UTF-8", input.display());
- return $not_utf8;
- }
- Ok(Some(s)) => s
- }
+pub fn load_string<P: AsRef<Path>>(file_path: P) -> Result<String, LoadStringError> {
+ let file_path = file_path.as_ref();
+ let mut contents = vec![];
+ let result = File::open(file_path)
+ .and_then(|mut f| f.read_to_end(&mut contents));
+ if let Err(e) = result {
+ let _ = writeln!(&mut io::stderr(),
+ "error reading `{}`: {}",
+ file_path.display(), e);
+ return Err(LoadStringError::ReadFail);
+ }
+ match str::from_utf8(&contents) {
+ Ok(s) => Ok(s.to_string()),
+ Err(_) => {
+ let _ = writeln!(&mut io::stderr(),
+ "error reading `{}`: not UTF-8",
+ file_path.display());
+ Err(LoadStringError::BadUtf8)
}
}
}
pub fn load_external_files(names: &[String]) -> Option<String> {
let mut out = String::new();
for name in names {
- out.push_str(&*load_or_return!(&name, None, None));
+ let s = match load_string(name) {
+ Ok(s) => s,
+ Err(_) => return None,
+ };
+ out.push_str(&s);
out.push('\n');
}
Some(out)
use rustc::session::search_paths::SearchPaths;
use rustc::session::config::Externs;
-use externalfiles::ExternalHtml;
+use externalfiles::{ExternalHtml, LoadStringError, load_string};
use html::render::reset_ids;
use html::escape::Escape;
css.push_str(&s)
}
- let input_str = load_or_return!(input, 1, 2);
+ let input_str = match load_string(input) {
+ Ok(s) => s,
+ Err(LoadStringError::ReadFail) => return 1,
+ Err(LoadStringError::BadUtf8) => return 2,
+ };
let playground = matches.opt_str("markdown-playground-url");
if playground.is_some() {
markdown::PLAYGROUND_KRATE.with(|s| { *s.borrow_mut() = Some(None); });
/// Run any tests/code examples in the markdown file `input`.
pub fn test(input: &str, cfgs: Vec<String>, libs: SearchPaths, externs: Externs,
mut test_args: Vec<String>) -> isize {
- let input_str = load_or_return!(input, 1, 2);
+ let input_str = match load_string(input) {
+ Ok(s) => s,
+ Err(LoadStringError::ReadFail) => return 1,
+ Err(LoadStringError::BadUtf8) => return 2,
+ };
let mut opts = TestOptions::default();
opts.no_crate_inject = true;