[pull] main from rust-lang:main

.cargo/config.toml

@@ -0,0 +1,2 @@
+[alias]
+dev = ["run", "--", "dev"]

CHANGELOG.md

@@ -3,7 +3,7 @@
 ### Changed
 
 - Upgrade to Rust edition 2024
-- Raise the minimum supported Rust version to `1.85`
+- Raise the minimum supported Rust version to `1.87`
 
 <a name="6.4.0"></a>
 

Cargo.toml

@@ -16,7 +16,7 @@ authors = [
 repository = "https://github.com/rust-lang/rustlings"
 license = "MIT"
 edition = "2024" # On Update: Update the edition of `rustfmt` in `dev check` and `CARGO_TOML` in `dev new`.
-rust-version = "1.85"
+rust-version = "1.87"
 
 [workspace.dependencies]
 serde = { version = "1.0", features = ["derive"] }
@@ -50,7 +50,6 @@ anyhow = "1.0"
 clap = { version = "4.5", features = ["derive"] }
 crossterm = { version = "0.29", default-features = false, features = ["windows", "events"] }
 notify = "8.0"
-os_pipe = "1.2"
 rustlings-macros = { path = "rustlings-macros", version = "=6.4.0" }
 serde_json = "1.0"
 serde.workspace = true

dev/Cargo.toml

@@ -1,4 +1,4 @@
-# Don't edit the `bin` list manually! It is updated by `cargo run -- dev update`. This comment line will be stripped in `rustlings init`.
+# Don't edit the `bin` list manually! It is updated by `cargo dev update`. This comment line will be stripped in `rustlings init`.
 bin = [
   { name = "intro1", path = "../exercises/00_intro/intro1.rs" },
   { name = "intro1_sol", path = "../solutions/00_intro/intro1.rs" },

oranda.json

@@ -1,4 +1,7 @@
 {
+  "build": {
+    "path_prefix": "rustlings"
+  },
   "project": {
     "homepage": "https://rustlings.cool",
     "repository": "https://github.com/rust-lang/rustlings"

src/cmd.rs

@@ -1,7 +1,7 @@
 use anyhow::{Context, Result, bail};
 use serde::Deserialize;
 use std::{
-    io::Read,
+    io::{Read, pipe},
     path::PathBuf,
     process::{Command, Stdio},
 };
@@ -17,7 +17,7 @@ fn run_cmd(mut cmd: Command, description: &str, output: Option<&mut Vec<u8>>) ->
     };
 
     let mut handle = if let Some(output) = output {
-        let (mut reader, writer) = os_pipe::pipe().with_context(|| {
+        let (mut reader, writer) = pipe().with_context(|| {
             format!("Failed to create a pipe to run the command `{description}``")
         })?;
 

src/dev/check.rs

@@ -43,7 +43,7 @@ fn check_cargo_toml(
     if old_bins != new_bins {
         if cfg!(debug_assertions) {
             bail!(
-                "The file `dev/Cargo.toml` is outdated. Run `cargo run -- dev update` to update it. Then run `cargo run -- dev check` again"
+                "The file `dev/Cargo.toml` is outdated. Run `cargo dev update` to update it. Then run `cargo run -- dev check` again"
             );
         }
 
@@ -379,7 +379,7 @@ pub fn check(require_solutions: bool) -> Result<()> {
     }
 
     if cfg!(debug_assertions) {
-        // A hack to make `cargo run -- dev check` work when developing Rustlings.
+        // A hack to make `cargo dev check` work when developing Rustlings.
         check_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")?;
     } else {
         check_cargo_toml(&info_file.exercises, "Cargo.toml", b"")?;

src/dev/update.rs

@@ -28,7 +28,7 @@ pub fn update() -> Result<()> {
     let info_file = InfoFile::parse()?;
 
     if cfg!(debug_assertions) {
-        // A hack to make `cargo run -- dev update` work when developing Rustlings.
+        // A hack to make `cargo dev update` work when developing Rustlings.
         update_cargo_toml(&info_file.exercises, "dev/Cargo.toml", b"../")
             .context("Failed to update the file `dev/Cargo.toml`")?;