Skip to content

ls: rename display_file_name to display_item_name#5675

Merged
sylvestre merged 2 commits intouutils:mainfrom
cakebaker:ls_rename_display_file_name
Dec 19, 2023
Merged

ls: rename display_file_name to display_item_name#5675
sylvestre merged 2 commits intouutils:mainfrom
cakebaker:ls_rename_display_file_name

Conversation

@cakebaker
Copy link
Copy Markdown
Contributor

@cakebaker cakebaker commented Dec 19, 2023

This PR renames the function display_file_name to display_item_name because the function is not limited to file names.

@sylvestre
Copy link
Copy Markdown
Contributor

sylvestre commented Dec 19, 2023

The doc gen is failing with:


error: unresolved link to `display_file_name`
    --> src/uu/ls/src/ls.rs:2547:22
     |
2547 | /// * `file_name` ([`display_file_name`])
     |                      ^^^^^^^^^^^^^^^^^ no item named `display_file_name` in scope
     |
     = help: to escape `[` and `]` characters, add '\' before them like `\[` or `\]`

@cakebaker cakebaker force-pushed the ls_rename_display_file_name branch from 02de4e7 to d8f299e Compare December 19, 2023 09:50
@sylvestre sylvestre merged commit 5cc5aa7 into uutils:main Dec 19, 2023
@cakebaker cakebaker deleted the ls_rename_display_file_name branch December 19, 2023 10:11
@github-actions
Copy link
Copy Markdown

github-actions bot commented Dec 19, 2023

GNU testsuite comparison:

Skip an intermittent issue tests/tail/inotify-dir-recreate
GNU test failed: tests/tail/truncate. tests/tail/truncate is passing on 'main'. Maybe you have to rebase?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@cakebaker @sylvestre