Skip to content

Commit

Permalink
Unrolled build for rust-lang#128449
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#128449 - Urgau:tmp-allow-negative-lit-lint, r=compiler-errors

Temporarily switch `ambiguous_negative_literals` lint to allow

This PR temporarily switch the `ambiguous_negative_literals` lint to `allow-by-default`, as asked by T-lang in rust-lang#128287 (comment).
  • Loading branch information
rust-timer authored Aug 1, 2024
2 parents 28a58f2 + 840ca3c commit bef9b19
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 13 deletions.
3 changes: 2 additions & 1 deletion compiler/rustc_lint/src/precedence.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ declare_lint! {
/// ### Example
///
/// ```rust,compile_fail
/// # #![deny(ambiguous_negative_literals)]
/// # #![allow(unused)]
/// -1i32.abs(); // equals -1, while `(-1i32).abs()` equals 1
/// ```
Expand All @@ -27,7 +28,7 @@ declare_lint! {
/// Method calls take precedence over unary precedence. Setting the
/// precedence explicitly makes the code clearer and avoid potential bugs.
pub AMBIGUOUS_NEGATIVE_LITERALS,
Deny,
Allow,
"ambiguous negative literals operations",
report_in_external_macro
}
Expand Down
2 changes: 2 additions & 0 deletions tests/ui/lint/negative_literals.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
//@ check-fail

#![deny(ambiguous_negative_literals)]

fn main() {
let _ = -1i32.abs();
//~^ ERROR `-` has lower precedence than method calls
Expand Down
28 changes: 16 additions & 12 deletions tests/ui/lint/negative_literals.stderr
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:4:13
--> $DIR/negative_literals.rs:6:13
|
LL | let _ = -1i32.abs();
| ^^^^^^^^^^^
|
= note: e.g. `-4.abs()` equals `-4`; while `(-4).abs()` equals `4`
= note: `#[deny(ambiguous_negative_literals)]` on by default
note: the lint level is defined here
--> $DIR/negative_literals.rs:3:9
|
LL | #![deny(ambiguous_negative_literals)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: add parentheses around the `-` and the literal to call the method on a negative literal
|
LL | let _ = (-1i32).abs();
Expand All @@ -16,7 +20,7 @@ LL | let _ = -(1i32.abs());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:6:13
--> $DIR/negative_literals.rs:8:13
|
LL | let _ = -1f32.abs();
| ^^^^^^^^^^^
Expand All @@ -32,7 +36,7 @@ LL | let _ = -(1f32.abs());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:8:13
--> $DIR/negative_literals.rs:10:13
|
LL | let _ = -1f64.asin();
| ^^^^^^^^^^^^
Expand All @@ -48,7 +52,7 @@ LL | let _ = -(1f64.asin());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:10:13
--> $DIR/negative_literals.rs:12:13
|
LL | let _ = -1f64.asinh();
| ^^^^^^^^^^^^^
Expand All @@ -64,7 +68,7 @@ LL | let _ = -(1f64.asinh());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:12:13
--> $DIR/negative_literals.rs:14:13
|
LL | let _ = -1f64.tan();
| ^^^^^^^^^^^
Expand All @@ -80,7 +84,7 @@ LL | let _ = -(1f64.tan());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:14:13
--> $DIR/negative_literals.rs:16:13
|
LL | let _ = -1f64.tanh();
| ^^^^^^^^^^^^
Expand All @@ -96,7 +100,7 @@ LL | let _ = -(1f64.tanh());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:16:13
--> $DIR/negative_literals.rs:18:13
|
LL | let _ = -1.0_f64.cos().cos();
| ^^^^^^^^^^^^^^^^^^^^
Expand All @@ -112,7 +116,7 @@ LL | let _ = -(1.0_f64.cos().cos());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:18:13
--> $DIR/negative_literals.rs:20:13
|
LL | let _ = -1.0_f64.cos().sin();
| ^^^^^^^^^^^^^^^^^^^^
Expand All @@ -128,7 +132,7 @@ LL | let _ = -(1.0_f64.cos().sin());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:20:13
--> $DIR/negative_literals.rs:22:13
|
LL | let _ = -1.0_f64.sin().cos();
| ^^^^^^^^^^^^^^^^^^^^
Expand All @@ -144,7 +148,7 @@ LL | let _ = -(1.0_f64.sin().cos());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:22:13
--> $DIR/negative_literals.rs:24:13
|
LL | let _ = -1f64.sin().sin();
| ^^^^^^^^^^^^^^^^^
Expand All @@ -160,7 +164,7 @@ LL | let _ = -(1f64.sin().sin());
| + +

error: `-` has lower precedence than method calls, which might be unexpected
--> $DIR/negative_literals.rs:25:11
--> $DIR/negative_literals.rs:27:11
|
LL | dbg!( -1.0_f32.cos() );
| ^^^^^^^^^^^^^^
Expand Down

0 comments on commit bef9b19

Please sign in to comment.