1
0
mirror of https://github.com/google/comprehensive-rust.git synced 2025-03-30 17:28:20 +02:00

cargo fmt

This commit is contained in:
Andrew Walbran 2025-02-27 15:03:50 +00:00
parent f5787fe90e
commit fd16d58901
9 changed files with 16 additions and 17 deletions

View File

@ -35,8 +35,8 @@
//! item becomes the first slide in that segment. Any other sub-items of the
//! top-level item are treated as further slides in the same segment.
use crate::frontmatter::{split_frontmatter, Frontmatter};
use crate::markdown::{duration, Table};
use crate::frontmatter::{Frontmatter, split_frontmatter};
use crate::markdown::{Table, duration};
use mdbook::book::{Book, BookItem, Chapter};
use std::fmt::Write;
use std::path::PathBuf;
@ -318,7 +318,9 @@ impl Session {
}
format!(
"Including {BREAK_DURATION} minute breaks, this session should take about {}. It contains:\n\n{}",
duration(self.minutes()), segments)
duration(self.minutes()),
segments
)
}
/// Return the total duration of this session.
@ -337,11 +339,7 @@ impl Session {
///
/// This includes breaks between segments.
pub fn target_minutes(&self) -> u64 {
if self.target_minutes > 0 {
self.target_minutes
} else {
self.minutes()
}
if self.target_minutes > 0 { self.target_minutes } else { self.minutes() }
}
}

View File

@ -14,7 +14,7 @@
use log::{info, trace};
use pulldown_cmark::{Event, Parser, Tag, TagEnd};
use std::fs::{create_dir_all, File};
use std::fs::{File, create_dir_all};
use std::io::Write;
use std::path::Path;

View File

@ -14,9 +14,9 @@
use anyhow::Context;
use log::trace;
use mdbook::BookItem;
use mdbook::book::Book;
use mdbook::renderer::RenderContext;
use mdbook::BookItem;
use mdbook_exerciser::process;
use std::fs::{create_dir, remove_dir_all};
use std::io::stdin;

View File

@ -17,8 +17,8 @@ use std::io::Write as _;
use std::path::{Path, PathBuf};
use anyhow::anyhow;
use fantoccini::elements::Element;
use fantoccini::Client;
use fantoccini::elements::Element;
use log::{debug, warn};
use serde::Serialize;
use strum::Display;

View File

@ -14,8 +14,8 @@
// ANCHOR: solution
// ANCHOR: setup
use futures_util::stream::StreamExt;
use futures_util::SinkExt;
use futures_util::stream::StreamExt;
use http::Uri;
use tokio::io::{AsyncBufReadExt, BufReader};
use tokio_websockets::{ClientBuilder, Message};

View File

@ -19,7 +19,7 @@ use futures_util::stream::StreamExt;
use std::error::Error;
use std::net::SocketAddr;
use tokio::net::{TcpListener, TcpStream};
use tokio::sync::broadcast::{channel, Sender};
use tokio::sync::broadcast::{Sender, channel};
use tokio_websockets::{Message, ServerBuilder, WebSocketStream};
// ANCHOR_END: setup

View File

@ -14,7 +14,7 @@
// ANCHOR: solution
// ANCHOR: Philosopher
use std::sync::{mpsc, Arc, Mutex};
use std::sync::{Arc, Mutex, mpsc};
use std::thread;
use std::time::Duration;

View File

@ -13,12 +13,12 @@
// limitations under the License.
// ANCHOR: solution
use std::sync::{mpsc, Arc, Mutex};
use std::sync::{Arc, Mutex, mpsc};
use std::thread;
// ANCHOR: setup
use reqwest::blocking::Client;
use reqwest::Url;
use reqwest::blocking::Client;
use scraper::{Html, Selector};
use thiserror::Error;

View File

@ -1,6 +1,7 @@
fn main() {
// Find target directory, either from CARGO_TARGET_DIR or in-tree if unset.
let mut src_dir = std::env::var_os("CARGO_TARGET_DIR").unwrap_or("../../../target".into());
let mut src_dir =
std::env::var_os("CARGO_TARGET_DIR").unwrap_or("../../../target".into());
src_dir.push("/cxxbridge/demo/src");
cxx_build::bridge("src/main.rs")