diff options
| author | bors <bors@rust-lang.org> | 2021-02-02 23:15:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-02-02 23:15:22 +0000 |
| commit | d95d4f0189e02ac2cd9056a0b39b0d5ab94fe69e (patch) | |
| tree | a90c3339a7ce44551ae29dac4a3b5d5ea554b58c /src/tools | |
| parent | 368275062fb655c1f36e0398f88b15379a1f3c93 (diff) | |
| parent | 81c64b34330090acf82285c3e9de67f876b3a98b (diff) | |
| download | rust-d95d4f0189e02ac2cd9056a0b39b0d5ab94fe69e.tar.gz rust-d95d4f0189e02ac2cd9056a0b39b0d5ab94fe69e.zip | |
Auto merge of #81678 - jackh726:rollup-3nerni4, r=jackh726
Rollup of 14 pull requests Successful merges: - #80593 (Upgrade Chalk) - #81260 (Add .editorconfig) - #81455 (Add AArch64 big-endian and ILP32 targets) - #81517 (Remove remnants of the santizer runtime crates from bootstrap) - #81530 (sys: use `process::abort()` instead of `arch::wasm32::unreachable()`) - #81544 (Add better diagnostic for unbounded Abst. Const) - #81588 (Add doc aliases for "delete") - #81603 (rustbuild: Don't build compiler twice for error-index-generator.) - #81634 (Add long explanation e0521) - #81636 (Directly use `Option<&[T]>` instead of converting from `Option<&Vec<T>>` later on) - #81647 (Fix bug with assert!() calling the wrong edition of panic!().) - #81655 (Improve wording of suggestion about accessing field) - #81665 (Fix out of date `Scalar` documentation) - #81671 (Add more associated type tests) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/.editorconfig | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/util.rs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/tools/clippy/.editorconfig b/src/tools/clippy/.editorconfig index a13173544d8..ec6e107d547 100644 --- a/src/tools/clippy/.editorconfig +++ b/src/tools/clippy/.editorconfig @@ -13,6 +13,8 @@ indent_style = space indent_size = 4 [*.md] +# double whitespace at end of line +# denotes a line break in Markdown trim_trailing_whitespace = false [*.yml] diff --git a/src/tools/compiletest/src/util.rs b/src/tools/compiletest/src/util.rs index 1647df8044c..292850bd9e2 100644 --- a/src/tools/compiletest/src/util.rs +++ b/src/tools/compiletest/src/util.rs @@ -38,6 +38,7 @@ const OS_TABLE: &[(&str, &str)] = &[ const ARCH_TABLE: &[(&str, &str)] = &[ ("aarch64", "aarch64"), + ("aarch64_be", "aarch64"), ("amd64", "x86_64"), ("arm", "arm"), ("arm64", "aarch64"), @@ -110,6 +111,7 @@ pub const TSAN_SUPPORTED_TARGETS: &[&str] = &[ ]; const BIG_ENDIAN: &[&str] = &[ + "aarch64_be", "armebv7r", "mips", "mips64", @@ -160,7 +162,9 @@ pub fn matches_env(triple: &str, name: &str) -> bool { } pub fn get_pointer_width(triple: &str) -> &'static str { - if (triple.contains("64") && !triple.ends_with("gnux32")) || triple.starts_with("s390x") { + if (triple.contains("64") && !triple.ends_with("gnux32") && !triple.ends_with("gnu_ilp32")) + || triple.starts_with("s390x") + { "64bit" } else if triple.starts_with("avr") { "16bit" |