Skip to content

Rustup to rustc 1.36.0-nightly (dbfe70dfc 2019-05-22) #4125

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 2 commits into from
May 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ matrix:
# We don't want to run these always because they go towards
# the build limit within the Travis rust-lang account.
# The jobs are approximately sorted by execution time
- env: INTEGRATION=rust-lang/cargo
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
# disabled cargo integration test due to https://github.com/rust-lang/rust-clippy/issues/4121
#- env: INTEGRATION=rust-lang/cargo
# if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang-nursery/chalk
if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
- env: INTEGRATION=rust-lang/rls
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/enum_variants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ impl EarlyLintPass for EnumVariantNames {
if let Some(&(ref mod_name, ref mod_camel)) = self.modules.last() {
// constants don't have surrounding modules
if !mod_camel.is_empty() {
if *mod_name == item_name {
if mod_name.as_symbol() == item.ident.name {
if let ItemKind::Mod(..) = item.node {
span_lint(
cx,
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/format.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UselessFormat {
then {
let (message, sugg) = if_chain! {
if let ExprKind::MethodCall(ref path, _, _) = format_arg.node;
if path.ident.as_interned_str() == "to_string";
if path.ident.as_interned_str().as_symbol() == sym!(to_string);
then {
("`to_string()` is enough",
snippet(cx, format_arg.span, "<arg>").to_string())
Expand Down
4 changes: 2 additions & 2 deletions clippy_lints/src/utils/higher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ pub fn range<'a, 'b, 'tcx>(cx: &LateContext<'a, 'tcx>, expr: &'b hir::Expr) -> O
if def_path.data.len() != 3 {
return None;
}
if def_path.data.get(0)?.data.as_interned_str() != "ops" {
if def_path.data.get(0)?.data.as_interned_str().as_symbol() != sym!(ops) {
return None;
}
if def_path.data.get(1)?.data.as_interned_str() != "range" {
if def_path.data.get(1)?.data.as_interned_str().as_symbol() != sym!(range) {
return None;
}
let type_name = def_path.data.get(2)?.data.as_interned_str();
Expand Down