Skip to content

Commit 755a322

Browse files
committed
Auto merge of #1690 - RalfJung:rustup, r=RalfJung
rustup; allow some lints
2 parents de0800e + 0e56bff commit 755a322

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9a9477fada5baf69d693e717d6df902e411a73d6
1+
a8f707553276a15565860af3d415aae18428aa96

tests/compile-fail/erroneous_const.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
//! Make sure we detect erroneous constants post-monomorphization even when they are unused.
22
//! (https://github.com/rust-lang/miri/issues/1382)
3+
// Inlining changes the error location
4+
// compile-flags: -Zmir-opt-level=0
35
#![feature(const_panic)]
46
#![feature(never_type)]
57
#![warn(warnings, const_err)]

tests/run-pass/float.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![feature(stmt_expr_attributes, test)]
2+
#![allow(arithmetic_overflow)]
23
use std::fmt::Debug;
34
use std::hint::black_box;
45

tests/run-pass/integer-ops.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
1-
// Copyright 2012-2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
4-
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
1+
#![allow(arithmetic_overflow)]
102

113
pub fn main() {
124
// This tests that do (not) do sign extension properly when loading integers

0 commit comments

Comments
 (0)