Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tools/rustbook: deny(rust_2018_idioms) #58833

Merged
merged 1 commit into from
Mar 3, 2019
Merged

tools/rustbook: deny(rust_2018_idioms) #58833

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/tools/rustbook/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
//
#![deny(rust_2018_idioms)]

use clap::{crate_version};

use std::env;
Expand Down Expand Up @@ -68,7 +69,7 @@ fn main() {
}

// Build command implementation
pub fn build_1(args: &ArgMatches) -> Result1<()> {
pub fn build_1(args: &ArgMatches<'_>) -> Result1<()> {
let book_dir = get_book_dir(args);
let mut book = MDBook1::load(&book_dir)?;

Expand All @@ -85,7 +86,7 @@ pub fn build_1(args: &ArgMatches) -> Result1<()> {
}

// Build command implementation
pub fn build_2(args: &ArgMatches) -> Result2<()> {
pub fn build_2(args: &ArgMatches<'_>) -> Result2<()> {
let book_dir = get_book_dir(args);
let mut book = MDBook2::load(&book_dir)?;

Expand All @@ -101,7 +102,7 @@ pub fn build_2(args: &ArgMatches) -> Result2<()> {
Ok(())
}

fn get_book_dir(args: &ArgMatches) -> PathBuf {
fn get_book_dir(args: &ArgMatches<'_>) -> PathBuf {
if let Some(dir) = args.value_of("dir") {
// Check if path is relative from current dir, or absolute...
let p = Path::new(dir);
Expand Down