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.

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

MSRV 1.57; update dependencies #704

Merged
merged 4 commits into from May 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cli.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
- macos-latest
- windows-latest
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
runs-on: ${{ matrix.platform }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/core.yml
Expand Up @@ -26,7 +26,7 @@ jobs:
- macos-latest
- windows-latest
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -47,7 +47,7 @@ jobs:
- macos-latest
- windows-latest
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
runs-on: ${{ matrix.platform }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/derive.yml
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57.0 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tokio.yml
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
rust:
- 1.56.0 # MSRV
- 1.57 # MSRV
- stable
steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/workspace.yml
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.56.0 # MSRV
toolchain: 1.57.0 # MSRV
components: clippy
override: true
profile: minimal
Expand Down
128 changes: 64 additions & 64 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cli/src/commands/gen/cmd.rs
Expand Up @@ -43,7 +43,7 @@ impl Runnable for Cmd {
impl Cmd {
/// Generate a new subcommand in this application
pub fn generate(&self, app_root: &Path, name: &str) {
let snake_case_name = name.replace("-", "_");
let snake_case_name = name.replace('-', "_");
let output_dir = app_root.join("src").join("commands");

if !output_dir.exists() {
Expand Down
7 changes: 6 additions & 1 deletion cli/src/commands/new.rs
Expand Up @@ -40,10 +40,12 @@ impl Runnable for NewCommand {
/// Run the Abscissa application generator
fn run(&self) {
let started_at = Instant::now();
#[allow(clippy::redundant_closure)]
let app_properties = self.parse_options().unwrap_or_else(|e| fatal_error(e));
let app_template = Collection::default();
let branch_name = "main";

#[allow(clippy::redundant_closure)]
self.create_parent_directory()
.unwrap_or_else(|e| fatal_error(e));

Expand All @@ -52,15 +54,18 @@ impl Runnable for NewCommand {
template_files.sort_by(|a, b| a.name().cmp(b.name()));

for template_file in &template_files {
#[allow(clippy::redundant_closure)]
self.render_template_file(&app_template, template_file, &app_properties)
.unwrap_or_else(|e| fatal_error(e));
}

// TODO(tarcieri): make this optional?
#[allow(clippy::redundant_closure)]
self.run_git_init(branch_name)
.unwrap_or_else(|e| fatal_error(e));

// TODO(tarcieri): make this optional?
#[allow(clippy::redundant_closure)]
self.generate_lockfile().unwrap_or_else(|e| fatal_error(e));

let duration = started_at.elapsed();
Expand Down Expand Up @@ -265,7 +270,7 @@ impl NewCommand {
.file_name()
.expect("no filename?")
.to_string_lossy()
.replace("-", "_");
.replace('-', "_");

let name: properties::name::App = app_name.parse().expect("no app name");

Expand Down