mirror of https://github.com/rust-lang/rustlings
Merge branch 'main' into main
Dan
2 months ago
committed by
GitHub
commit
30273a6ee5
@ -1,102 +1,83 @@
|
|||||||
use glob::glob;
|
use anyhow::{Context, Result};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::Serialize;
|
||||||
use std::env;
|
use std::env;
|
||||||
use std::error::Error;
|
use std::path::PathBuf;
|
||||||
use std::path::{Path, PathBuf};
|
use std::process::{Command, Stdio};
|
||||||
use std::process::Command;
|
|
||||||
|
use crate::exercise::Exercise;
|
||||||
|
|
||||||
/// Contains the structure of resulting rust-project.json file
|
/// Contains the structure of resulting rust-project.json file
|
||||||
/// and functions to build the data required to create the file
|
/// and functions to build the data required to create the file
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize)]
|
||||||
pub struct RustAnalyzerProject {
|
struct RustAnalyzerProject {
|
||||||
sysroot_src: String,
|
sysroot_src: PathBuf,
|
||||||
pub crates: Vec<Crate>,
|
crates: Vec<Crate>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize, Deserialize)]
|
#[derive(Serialize)]
|
||||||
pub struct Crate {
|
struct Crate {
|
||||||
root_module: String,
|
root_module: PathBuf,
|
||||||
edition: String,
|
edition: &'static str,
|
||||||
deps: Vec<String>,
|
// Not used, but required in the JSON file.
|
||||||
cfg: Vec<String>,
|
deps: Vec<()>,
|
||||||
|
// Only `test` is used for all crates.
|
||||||
|
// Therefore, an array is used instead of a `Vec`.
|
||||||
|
cfg: [&'static str; 1],
|
||||||
}
|
}
|
||||||
|
|
||||||
impl RustAnalyzerProject {
|
impl RustAnalyzerProject {
|
||||||
pub fn new() -> RustAnalyzerProject {
|
fn build(exercises: Vec<Exercise>) -> Result<Self> {
|
||||||
RustAnalyzerProject {
|
let crates = exercises
|
||||||
sysroot_src: String::new(),
|
.into_iter()
|
||||||
crates: Vec::new(),
|
.map(|exercise| Crate {
|
||||||
}
|
root_module: exercise.path,
|
||||||
}
|
edition: "2021",
|
||||||
|
deps: Vec::new(),
|
||||||
/// Write rust-project.json to disk
|
// This allows rust_analyzer to work inside `#[test]` blocks
|
||||||
pub fn write_to_disk(&self) -> Result<(), std::io::Error> {
|
cfg: ["test"],
|
||||||
std::fs::write(
|
})
|
||||||
"./rust-project.json",
|
.collect();
|
||||||
serde_json::to_vec(&self).expect("Failed to serialize to JSON"),
|
|
||||||
)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// If path contains .rs extension, add a crate to `rust-project.json`
|
if let Some(path) = env::var_os("RUST_SRC_PATH") {
|
||||||
fn path_to_json(&mut self, path: PathBuf) -> Result<(), Box<dyn Error>> {
|
return Ok(Self {
|
||||||
if let Some(ext) = path.extension() {
|
sysroot_src: PathBuf::from(path),
|
||||||
if ext == "rs" {
|
crates,
|
||||||
self.crates.push(Crate {
|
});
|
||||||
root_module: path.display().to_string(),
|
|
||||||
edition: "2021".to_string(),
|
|
||||||
deps: Vec::new(),
|
|
||||||
// This allows rust_analyzer to work inside #[test] blocks
|
|
||||||
cfg: vec!["test".to_string()],
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Parse the exercises folder for .rs files, any matches will create
|
|
||||||
/// a new `crate` in rust-project.json which allows rust-analyzer to
|
|
||||||
/// treat it like a normal binary
|
|
||||||
pub fn exercises_to_json(&mut self) -> Result<(), Box<dyn Error>> {
|
|
||||||
for path in glob("./exercises/**/*")? {
|
|
||||||
self.path_to_json(path?)?;
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Use `rustc` to determine the default toolchain
|
|
||||||
pub fn get_sysroot_src(&mut self) -> Result<(), Box<dyn Error>> {
|
|
||||||
// check if RUST_SRC_PATH is set
|
|
||||||
if let Ok(path) = env::var("RUST_SRC_PATH") {
|
|
||||||
self.sysroot_src = path;
|
|
||||||
return Ok(());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let toolchain = Command::new("rustc")
|
let toolchain = Command::new("rustc")
|
||||||
.arg("--print")
|
.arg("--print")
|
||||||
.arg("sysroot")
|
.arg("sysroot")
|
||||||
.output()?
|
.stderr(Stdio::inherit())
|
||||||
|
.output()
|
||||||
|
.context("Failed to get the sysroot from `rustc`. Do you have `rustc` installed?")?
|
||||||
.stdout;
|
.stdout;
|
||||||
|
|
||||||
let toolchain = String::from_utf8(toolchain)?;
|
let toolchain =
|
||||||
|
String::from_utf8(toolchain).context("The toolchain path is invalid UTF8")?;
|
||||||
let toolchain = toolchain.trim_end();
|
let toolchain = toolchain.trim_end();
|
||||||
|
|
||||||
println!("Determined toolchain: {toolchain}\n");
|
println!("Determined toolchain: {toolchain}\n");
|
||||||
|
|
||||||
let Ok(path) = Path::new(toolchain)
|
let mut sysroot_src = PathBuf::with_capacity(256);
|
||||||
.join("lib")
|
sysroot_src.extend([toolchain, "lib", "rustlib", "src", "rust", "library"]);
|
||||||
.join("rustlib")
|
|
||||||
.join("src")
|
|
||||||
.join("rust")
|
|
||||||
.join("library")
|
|
||||||
.into_os_string()
|
|
||||||
.into_string()
|
|
||||||
else {
|
|
||||||
return Err("The sysroot path is invalid UTF8".into());
|
|
||||||
};
|
|
||||||
self.sysroot_src = path;
|
|
||||||
|
|
||||||
Ok(())
|
Ok(Self {
|
||||||
|
sysroot_src,
|
||||||
|
crates,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Write `rust-project.json` to disk.
|
||||||
|
pub fn write_project_json(exercises: Vec<Exercise>) -> Result<()> {
|
||||||
|
let content = RustAnalyzerProject::build(exercises)?;
|
||||||
|
|
||||||
|
// Using the capacity 2^14 since the file length in bytes is higher than 2^13.
|
||||||
|
// The final length is not known exactly because it depends on the user's sysroot path,
|
||||||
|
// the current number of exercises etc.
|
||||||
|
let mut buf = Vec::with_capacity(1 << 14);
|
||||||
|
serde_json::to_writer(&mut buf, &content)?;
|
||||||
|
std::fs::write("rust-project.json", buf)?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue