Opened 5 months ago

Closed 5 weeks ago

Last modified 5 weeks ago

#26973 closed defect (implemented)

Privcount blinding and encryption: add rustfmt CI check

Reported by: teor Owned by: teor
Priority: Medium Milestone: Tor: 0.4.0.x-final
Component: Core Tor/Tor Version:
Severity: Normal Keywords: privcount, 035-roadmap-master, 035-triaged-in-20180711, rust
Cc: teor, nickm, chelseakomlo Actual Points:
Parent ID: #25669 Points:
Reviewer: nickm Sponsor: SponsorV

Description

We should check that rustfmt has been run on the privcount_shamir code in our CI. See:
https://trac.torproject.org/projects/tor/ticket/26955?replyto=3#comment:3

Child Tickets

Change History (10)

comment:1 Changed 4 months ago by teor

We can copy the code and configs from #26972, which does rustfmt checks for tor.

comment:2 Changed 4 months ago by teor

Reviewer: nickm
Status: assignedneeds_review

Please see my branch ticket26973 in https://github.com/teor2345/privcount_shamir.git

I disabled the rustfmt check because rust stable and beta disagree about some formatting. For example, see:
https://travis-ci.org/teor2345/privcount_shamir/jobs/414426254#L1612

The passing build is:
https://travis-ci.org/teor2345/privcount_shamir/builds/414430540

I still think we should merge this patch, because the current code passes the rustfmt check with rustfmt 0.99.1.

Then we should defer the remaining tasks until Tor 0.3.6:

  • wait until rustfmt 0.99.1 hits stable
  • do a final format with rustfmt
  • activate the travis rustfmt check

Assigning to nickm, because he probably wants to merge the rustfmt changes before starting other rust tickets.

comment:3 Changed 4 months ago by nickm

Status: needs_reviewmerge_ready

This looks okay, except for the fact that the rustfmt commit itself will have conflicts with my patch series currently under review.

So my current plan here is that, once that other patch series is merged, we should cherry-pick everything from this branch except for the rustfmt commit (bdc2db60153ef9c3044b72309cc1b35f45f85618), and then re-run rustfmt separately.

comment:4 Changed 4 months ago by teor

Sounds good.

We should re-run nightly rustfmt, because nightly and stable format the files differently.

comment:5 Changed 4 months ago by nickm

Sponsor: SponsorV

comment:6 Changed 3 months ago by nickm

Milestone: Tor: 0.3.5.x-finalTor: 0.3.6.x-final

Deferring privcount tickets in 0.3.5 to 0.3.6

comment:7 Changed 8 weeks ago by nickm

Teor -- I'll do this once you say the time is ripe, or you can do it. I'm not hacking on this repo for the next few days at least.

comment:8 Changed 6 weeks ago by teor

Hi nickm, now would be a good time to re-run rustfmt, and merge this ticket.

No-one is working on PrivCount right now.

comment:9 Changed 5 weeks ago by nickm

Resolution: implemented
Status: merge_readyclosed

Okay -- merged!

comment:10 Changed 5 weeks ago by nickm

Milestone: Tor: 0.3.6.x-finalTor: 0.4.0.x-final

Tor 0.3.6.x has been renamed to 0.4.0.x.

Note: See TracTickets for help on using tickets.