Skip to content

Commit 6d3602e

Browse files
authored
Merge branch 'main' into test_install_root_combined
2 parents f705452 + 01c8d6e commit 6d3602e

728 files changed

Lines changed: 22230 additions & 8533 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.cargo/config.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ linker = "x86_64-unknown-redox-gcc"
88
linker = "aarch64-linux-gnu-gcc"
99
[target.riscv64gc-unknown-linux-musl]
1010
rustflags = ["-C", "target-feature=+crt-static"]
11+
[target.'cfg(target_env = "msvc")']
12+
rustflags = ["-C", "target-feature=+crt-static"]
1113

1214
[env]
1315
# See feat_external_libstdbuf in src/uu/stdbuf/Cargo.toml
1416
LIBSTDBUF_DIR = "/usr/local/libexec/coreutils"
17+
18+
# remove me
19+
[build]
20+
rustflags = ["-A", "clippy::collapsible_if"]

.clippy.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
msrv = "1.85.0"
21
avoid-breaking-exported-api = false
32
check-private-items = true
43
cognitive-complexity-threshold = 24
54
missing-docs-in-crate-items = true
5+
allow-mixed-uninlined-format-args = false

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ switch_case_indent = true
5757
end_of_line = crlf
5858
insert_final_newline = false
5959

60+
[*.toml]
61+
indent_size = 2
62+
indent_style = space
63+
6064
[*.{yaml,yml,[Yy][Mm][Ll],[Yy][Aa][Mm][Ll]}]
6165
# YAML
6266
indent_size = 2

0 commit comments

Comments
 (0)