Skip to content

Rust upgrade to rustc 1.23.0-nightly (f0fe716db 2017-10-30) #2191

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

Merged
merged 3 commits into from
Oct 31, 2017
Merged

Conversation

Manishearth
Copy link
Member

@Manishearth Manishearth commented Oct 31, 2017

fixes #2192

@Manishearth
Copy link
Member Author

@kennytm looks like lint_without_lint_pass was broken; care to take a look?

@kennytm
Copy link
Member

kennytm commented Oct 31, 2017

Reproduced locally. The lint did not fire. Currently checking why.

@kennytm
Copy link
Member

kennytm commented Oct 31, 2017

@Manishearth Please apply these diff:

1. Get rid of the lt.is_elided() check from internal_lints.rs (why is it here in the first place?)
diff --git a/clippy_lints/src/utils/internal_lints.rs b/clippy_lints/src/utils/internal_lints.rs
index a35b034d..6e62f967 100644
--- a/clippy_lints/src/utils/internal_lints.rs
+++ b/clippy_lints/src/utils/internal_lints.rs
@@ -161,16 +161,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for LintWithoutLintPass {
 
 fn is_lint_ref_type(ty: &Ty) -> bool {
     if let TyRptr(
-        ref lt,
+        _,
         MutTy {
             ty: ref inner,
             mutbl: MutImmutable,
         },
     ) = ty.node
     {
-        if lt.is_elided() {
-            return false;
-        }
         if let TyPath(ref path) = inner.node {
             return match_qpath(path, &paths::LINT);
         }
2. The module rustc::lint::* becomes just lint::*, so update paths.rs
diff --git a/clippy_lints/src/utils/paths.rs b/clippy_lints/src/utils/paths.rs
index 96ccddaf..95e14609 100644
--- a/clippy_lints/src/utils/paths.rs
+++ b/clippy_lints/src/utils/paths.rs
@@ -41,8 +41,8 @@ pub const IO_READ: [&str; 3] = ["std", "io", "Read"];
 pub const IO_WRITE: [&str; 3] = ["std", "io", "Write"];
 pub const ITERATOR: [&str; 4] = ["core", "iter", "iterator", "Iterator"];
 pub const LINKED_LIST: [&str; 3] = ["alloc", "linked_list", "LinkedList"];
-pub const LINT: [&str; 3] = ["rustc", "lint", "Lint"];
-pub const LINT_ARRAY: [&str; 3] = ["rustc", "lint", "LintArray"];
+pub const LINT: [&str; 2] = ["lint", "Lint"];
+pub const LINT_ARRAY: [&str; 2] = ["lint", "LintArray"];
 pub const MEM_FORGET: [&str; 3] = ["core", "mem", "forget"];
 pub const MEM_UNINIT: [&str; 3] = ["core", "mem", "uninitialized"];
 pub const MEM_ZEROED: [&str; 3] = ["core", "mem", "zeroed"];
3. Some minor UI test fix.
diff --git a/tests/ui/lint_pass.rs b/tests/ui/lint_pass.rs
index b576f72e..29c93e74 100644
--- a/tests/ui/lint_pass.rs
+++ b/tests/ui/lint_pass.rs
@@ -2,7 +2,6 @@
 #![feature(rustc_private)]
 #![feature(macro_vis_matcher)]
 
-
 #![warn(lint_without_lint_pass)]
 
 #[macro_use] extern crate rustc;

@Manishearth
Copy link
Member Author

Thanks, @kennytm !

@Manishearth Manishearth deleted the rustup branch October 31, 2017 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants