aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_parser/src/token_set.rs
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-10 18:37:07 +0100
committerGitHub <[email protected]>2020-05-10 18:37:07 +0100
commita3dbd272e01870b309fd3b783598038c1103653a (patch)
tree68cd7dcf07415b80ed0d6b7af2cbcc1565a1a640 /crates/ra_parser/src/token_set.rs
parent348cbc054c91dbdae3633d5f401a1187e79232ee (diff)
parent3de3b52f10d6881a5e6cb5ccc6d6321eea9175fa (diff)
parent31d5c8d4878911b21280b144b1aac19545509973 (diff)
parent98a7bb24358c0f1e9353195d6933f5973c8edaba (diff)
parentcbbbd4832582256820695bb73fdb4ca125f1b1f9 (diff)
Merge #4406 #4410 #4411 #4417
4406: Update cargo-metadata r=matklad a=edwin0cheng This PR update `cargo-metadata` to 0.10.0 and it also relax the` serde-derive` deps to 1.0 for tests in `proc-macro-srv`. cc @robojumper r= @matklad , I think you would have something to say related to https://github.com/serde-rs/json/issues/647#issue-593788429 ? 4410: Improve wording in comment r=matklad a=edwin0cheng 4411: do not remove then block when you unwrap else block #4361 r=matklad a=bnjjj close #4361 4417: Omit default types in HirDisplay SourceCode mode r=matklad a=TimoFreiberg Closes #4390 Co-authored-by: Edwin Cheng <[email protected]> Co-authored-by: Benjamin Coenen <[email protected]> Co-authored-by: Timo Freiberg <[email protected]>