diff options
author | David Tolnay <dtolnay@fb.com> | 2022-03-29 19:01:35 -0700 |
---|---|---|
committer | Facebook GitHub Bot <facebook-github-bot@users.noreply.github.com> | 2022-03-29 19:01:35 -0700 |
commit | a7a098444f3f394cb7901d9a94a71aa106a8fea5 (patch) | |
tree | 9e32a873fd11a3aeb6a42d0c679818c912724ff7 | |
parent | 9a47c80a77e68f361d1962b2325873cf715e1998 (diff) |
Prepare for rustfmt upgrade 10/13
Summary:
Context: I am upgrading rustfmt in D35234535.
---
This diff contains all the formatting changes which are idempotent between the old and the new version of rustfmt. It's generated by formatting with the new rustfmt, then formatting immediately again with the old rustfmt. If there are any big changes in here, that's code that old rustfmt used to crash on but new rustfmt handles correctly.
Separating out this part of the changes prior to flipping the rustfmt version switch globally allows the amount of code that needs to be landed atomically to be smaller, since this diff is independent and can land at any point before the rest of the stack.
---
Reviewed By: zertosh
Differential Revision: D35234514
fbshipit-source-id: 10bc442e143591be9e6f10ba360952a1779764c1
-rw-r--r-- | below/common/src/dateutil.rs | 1 | ||||
-rw-r--r-- | below/src/main.rs | 2 | ||||
-rw-r--r-- | below/src/test.rs | 1 | ||||
-rw-r--r-- | below/store/src/test/test_cbor.rs | 3 |
4 files changed, 0 insertions, 7 deletions
diff --git a/below/common/src/dateutil.rs b/below/common/src/dateutil.rs index ba25fa6d..5672a47c 100644 --- a/below/common/src/dateutil.rs +++ b/below/common/src/dateutil.rs @@ -159,7 +159,6 @@ impl HgTime { duration_str }; - if plus || from_now { duration_str .parse::<humantime::Duration>() diff --git a/below/src/main.rs b/below/src/main.rs index ebab7f81..cfe9c406 100644 --- a/below/src/main.rs +++ b/below/src/main.rs @@ -1107,7 +1107,6 @@ fn live_local( }) .expect("Failed to spawn thread"); - view.run() } @@ -1172,7 +1171,6 @@ fn live_remote( }) .expect("Failed to spawn thread"); - logutil::set_current_log_target(logutil::TargetLog::File); view.run() } diff --git a/below/src/test.rs b/below/src/test.rs index d287a2b7..bfc9fc6b 100644 --- a/below/src/test.rs +++ b/below/src/test.rs @@ -34,7 +34,6 @@ fn record_replay_integration() { ) .expect("Failed to create store"); - // Collect a sample let sample = Collector::new( logger.clone(), diff --git a/below/store/src/test/test_cbor.rs b/below/store/src/test/test_cbor.rs index 37a79587..cba6c167 100644 --- a/below/store/src/test/test_cbor.rs +++ b/below/store/src/test/test_cbor.rs @@ -51,7 +51,6 @@ lazy_static! { name: "alice".to_owned(), t: 1234, }; - static ref WITH_PAYLOAD: WithPayload = WithPayload { name: "alice".to_owned(), t: 1234, @@ -66,13 +65,11 @@ lazy_static! { } }, }; - static ref WITH_NO_PAYLOAD: WithOptionalPayload = WithOptionalPayload { name: "alice".to_owned(), t: 1234, payload: None, }; - static ref WITH_SOME_PAYLOAD: WithOptionalPayload = WithOptionalPayload { name: "alice".to_owned(), t: 1234, |