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

[more] implementation #373

Merged
merged 5 commits into from
Nov 16, 2024
Merged

[more] implementation #373

merged 5 commits into from
Nov 16, 2024

Conversation

Wandalen
Copy link
Contributor

@Wandalen Wandalen commented Nov 1, 2024

No description provided.

@Wandalen
Copy link
Contributor Author

Wandalen commented Nov 1, 2024

@jgarzik ready for review 🫡

@@ -2,6 +2,8 @@ name: Rust

on:
push:
branches:
- more
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change leaked in from development branch?

This PR should not update TestingCI.yml at all, AFAICS.

.gitignore Outdated
@@ -1,3 +1,2 @@

target/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR should not update .gitignore at all?

display/more.rs Outdated

/// more - display files on a page-by-page basis.
#[derive(Parser)]
#[command(version, about = "more - display files on a page-by-page basis")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The string constant should be wrapped inside a gettext() call

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs fixing.

display/more.rs Outdated
#[command(version, about = "more - display files on a page-by-page basis")]
struct Args {
// Enable interactive session test
#[arg(long = "test", help = "Enable interactive session test.")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto for all help = "xxx" should be help = gettext("xxx")

display/more.rs Show resolved Hide resolved
display/tags Show resolved Hide resolved
@Wandalen
Copy link
Contributor Author

Wandalen commented Nov 8, 2024

@jgarzik fixed. please review

Copy link
Contributor

@jgarzik jgarzik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost there. A few small changes still needed (see review comments).

@@ -44,4 +44,4 @@ jobs:
- name: Build
run: cargo build --release --verbose
- name: Run tests
run: cargo test --release --verbose
run: cargo test --release --verbose
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should not be touched by this PR.

gettext-rs.workspace = true
libc = { version = "0.2", default-features = false }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be libc.workspace.

display/more.rs Outdated

/// more - display files on a page-by-page basis.
#[derive(Parser)]
#[command(version, about = "more - display files on a page-by-page basis")]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This still needs fixing.

@Wandalen
Copy link
Contributor Author

@jgarzik done. please check

@jgarzik jgarzik merged commit 9ea5322 into rustcoreutils:main Nov 16, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants