mirror of
https://github.com/rust-lang/rustlings.git
synced 2024-12-26 15:26:29 +00:00
Fix tests
This commit is contained in:
parent
0df0be8352
commit
d8c2ab8349
1 changed files with 2 additions and 12 deletions
|
@ -2,8 +2,6 @@ use anyhow::{bail, Context, Error, Result};
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use std::{fs, io::ErrorKind};
|
use std::{fs, io::ErrorKind};
|
||||||
|
|
||||||
use crate::DEBUG_PROFILE;
|
|
||||||
|
|
||||||
// The mode of the exercise.
|
// The mode of the exercise.
|
||||||
#[derive(Deserialize, Copy, Clone)]
|
#[derive(Deserialize, Copy, Clone)]
|
||||||
#[serde(rename_all = "lowercase")]
|
#[serde(rename_all = "lowercase")]
|
||||||
|
@ -48,23 +46,15 @@ pub struct InfoFile {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl InfoFile {
|
impl InfoFile {
|
||||||
fn from_embedded() -> Result<Self> {
|
|
||||||
toml_edit::de::from_str(include_str!("../info.toml"))
|
|
||||||
.context("Failed to parse the embedded `info.toml` file")
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn parse() -> Result<Self> {
|
pub fn parse() -> Result<Self> {
|
||||||
if DEBUG_PROFILE {
|
|
||||||
return Self::from_embedded();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Read a local `info.toml` if it exists.
|
// Read a local `info.toml` if it exists.
|
||||||
let slf = match fs::read_to_string("info.toml") {
|
let slf = match fs::read_to_string("info.toml") {
|
||||||
Ok(file_content) => toml_edit::de::from_str::<Self>(&file_content)
|
Ok(file_content) => toml_edit::de::from_str::<Self>(&file_content)
|
||||||
.context("Failed to parse the `info.toml` file")?,
|
.context("Failed to parse the `info.toml` file")?,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
if e.kind() == ErrorKind::NotFound {
|
if e.kind() == ErrorKind::NotFound {
|
||||||
return Self::from_embedded();
|
return toml_edit::de::from_str(include_str!("../info.toml"))
|
||||||
|
.context("Failed to parse the embedded `info.toml` file");
|
||||||
}
|
}
|
||||||
|
|
||||||
return Err(Error::from(e).context("Failed to read the `info.toml` file"));
|
return Err(Error::from(e).context("Failed to read the `info.toml` file"));
|
||||||
|
|
Loading…
Reference in a new issue