Skip to content

Rollup up 3 pull requests #5339

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.

Sign up for GitHub

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

Closed
wants to merge 8 commits into from
Closed

Rollup up 3 pull requests #5339

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b8effec
rustup https://github.com/rust-lang/rust/pull/69838
matthiaskrgr Mar 17, 2020
b875c53
rustup https://github.com/rust-lang/rust/pull/69189
matthiaskrgr Mar 18, 2020
b9d6bf3
rustup https://github.com/rust-lang/rust/pull/69920/
matthiaskrgr Mar 18, 2020
4407e04
Merge branch 'rustup_33' into rollup
matthiaskrgr Mar 19, 2020
c92e320
Merge branch 'rustup_34' into rollup
matthiaskrgr Mar 19, 2020
a1cfd7c
Merge branch 'rustup_35' into rollup
matthiaskrgr Mar 19, 2020
6943363
ci: create "integration" dir before moving files there, see if this i…
matthiaskrgr Mar 19, 2020
8cb59cc
add debug
matthiaskrgr Mar 19, 2020
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
Next Next commit
rustup rust-lang/rust#69838
  • Loading branch information
@matthiaskrgr
matthiaskrgr committed Mar 17, 2020
commit b8effecee18256c88bf4189446cdacdff439210b
2 changes: 1 addition & 1 deletion clippy_lints/src/write.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ impl Write {
};
let tts = tts.clone();

let mut parser = parser::Parser::new(&cx.sess.parse_sess, tts, None, false, false, None);
let mut parser = parser::Parser::new(&cx.sess.parse_sess, tts, false, None);
let mut expr: Option<Expr> = None;
if is_write {
expr = match parser.parse_expr().map_err(|mut err| err.cancel()) {
Expand Down