Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build for latest rust master #2713

Merged
merged 6 commits into from
May 4, 2018
Merged

Conversation

alexreg
Copy link
Contributor

@alexreg alexreg commented May 1, 2018

Fixes #2708.

@alexreg alexreg changed the title Fixed build for latest nightly Fixed build for latest rust master May 1, 2018
@oli-obk oli-obk closed this May 3, 2018
@oli-obk oli-obk reopened this May 3, 2018
@oli-obk
Copy link
Contributor

oli-obk commented May 3, 2018

Retriggering travis

@sanmai-NL
Copy link
Contributor

@alexreg: Looks like a few tests fail.

@oli-obk
Copy link
Contributor

oli-obk commented May 3, 2018

PR rust-lang/rust#49724 broke our range inclusive things. I'm fixing them atm

@oli-obk
Copy link
Contributor

oli-obk commented May 3, 2018

Clippy goes into an infinite loop on some input. I probably won't get to a machine where I can run gdb for the next few days :/

@alexreg
Copy link
Contributor Author

alexreg commented May 4, 2018

Tried to run the tests locally, but getting failures like this for clippy:

---- [run-pass] run-pass/associated-constant-ice.rs stdout ----
	thread '[run-pass] run-pass/associated-constant-ice.rs' panicked at 'failed to exec `"target/debug/clippy-driver" "tests/run-pass/associated-constant-ice.rs" "-L" "/Users/alex/Software/rust/src/tools/clippy/target/debug/test_build_base" "--target=x86_64-apple-darwin" "-C" "prefer-dynamic" "-o" "/Users/alex/Software/rust/src/tools/clippy/target/debug/test_build_base/associated-constant-ice.stage-id" "-L" "target/debug" "-L" "target/debug/deps" "-Dwarnings" "-L" "/Users/alex/Software/rust/src/tools/clippy/target/debug/test_build_base/associated-constant-ice.stage-id.aux"`: Os { code: 2, kind: NotFound, message: "No such file or directory" }', libcore/result.rs:945:5

@mati865
Copy link
Contributor

mati865 commented May 4, 2018

I don't see hangs on the Linux but inline and docs checks are messed up:

Click me
diff --git a/tests/ui/inline_fn_without_body.stderr b/tests/ui/inline_fn_without_body.stderr
index 2b466b68..e69de29b 100644
--- a/tests/ui/inline_fn_without_body.stderr
+++ b/tests/ui/inline_fn_without_body.stderr
@@ -1,26 +0,0 @@
-error: use of `#[inline]` on trait method `default_inline` which has no body
- --> $DIR/inline_fn_without_body.rs:8:5
-  |
-8 |       #[inline]
-  |  _____-^^^^^^^^
-9 | |     fn default_inline();
-  | |____- help: remove
-  |
-  = note: `-D inline-fn-without-body` implied by `-D warnings`
-
-error: use of `#[inline]` on trait method `always_inline` which has no body
-  --> $DIR/inline_fn_without_body.rs:11:5
-   |
-11 |     #[inline(always)]fn always_inline();
-   |     ^^^^^^^^^^^^^^^^^ help: remove
-
-error: use of `#[inline]` on trait method `never_inline` which has no body
-  --> $DIR/inline_fn_without_body.rs:13:5
-   |
-13 |       #[inline(never)]
-   |  _____-^^^^^^^^^^^^^^^
-14 | |     fn never_inline();
-   | |____- help: remove
-
-error: aborting due to 3 previous errors
-
diff --git a/tests/ui/missing-doc.stderr b/tests/ui/missing-doc.stderr
index 54834f90..ae2be387 100644
--- a/tests/ui/missing-doc.stderr
+++ b/tests/ui/missing-doc.stderr
@@ -78,6 +78,16 @@ error: missing documentation for a function
 51 | fn foo3() {}
    | ^^^^^^^^^^^^
 
+error: use of `#[inline]` on trait method `foo` which has no body
+  --> $DIR/missing-doc.rs:56:5
+   |
+56 |       /// dox
+   |  _____-^^^^^^
+57 | |     fn foo(&self);
+   | |____- help: remove
+   |
+   = note: #[deny(inline_fn_without_body)] on by default
+
 error: missing documentation for a trait
   --> $DIR/missing-doc.rs:68:1
    |
@@ -264,5 +274,5 @@ error: missing documentation for a function
 191 |         fn also_undocumented2() {}
     |         ^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: aborting due to 39 previous errors
+error: aborting due to 40 previous errors

@@ -45,7 +45,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {

fn check_attrs(cx: &LateContext, name: &Name, attrs: &[Attribute]) {
for attr in attrs {
if attr.name().map_or(true, |n| n != "inline") {
if attr.name() == "inline" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change == to !=.
With that change all tests passed on my Linux box.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, superb. Let's see what travis says

@oli-obk oli-obk merged commit c1b39c4 into rust-lang:master May 4, 2018
@oli-obk
Copy link
Contributor

oli-obk commented May 4, 2018

Whooo. Thanks everyone for the issue search and/or commits! I'll publish a new version later today

@alexreg
Copy link
Contributor Author

alexreg commented May 4, 2018

Thanks for spotting that! Sorry about the sloppy edit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants