Skip to content
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

Rollup of 6 pull requests #95792

Closed
wants to merge 12 commits into from
Closed

Commits on Mar 24, 2022

  1. Configuration menu
    Copy the full SHA
    d5a32d8 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Mailmap update

    dtolnay committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    05a467e View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2022

  1. Configuration menu
    Copy the full SHA
    39bff4b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3191d27 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    5974c18 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2022

  1. Configuration menu
    Copy the full SHA
    66b3ca0 View commit details
    Browse the repository at this point in the history
  2. Rollup merge of rust-lang#95102 - compiler-errors:issue-94034-bug, r=…

    …jackh726
    
    Add known-bug for rust-lang#95034
    
    Couldn't fix the issue, since I am no type theorist and inference variables in universes above U0 scare me. But I at least wanted to add a known-bug test for it.
    
    cc rust-lang#95034 (does not fix)
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    aa3f60a View commit details
    Browse the repository at this point in the history
  3. Rollup merge of rust-lang#95634 - dtolnay:mailmap, r=Mark-Simulacrum

    Mailmap update
    
    I noticed there are a lot of contributors who appear multiple times in https://thanks.rust-lang.org/rust/all-time/, which makes their "rank" on that page inaccurate. For example Nick Cameron currently appears at rank 21 with 2010 contributions and at rank 27 with 1287 contributions, because some of those are from nrc&rust-lang#8288;``@ncameron.org`` and some from ncameron&rust-lang#8288;``@mozilla.com.`` In reality Nick's rank would be 11 if counted correctly, which is a large difference.
    
    Solving this in a totally automated way is tricky because it involves figuring out whether Nick is 1 person with multiple emails, or is 2 people sharing the same name.
    
    This PR addresses a subset of the cases: only where a person has committed under multiple names using the same email. This is still not something that can be totally automated (e.g. by modifying https://github.com/rust-lang/thanks to dedup by email instead of name+email) because:
    
    - Some emails are not necessarily unique to one contributor, such as `ubuntu@localhost`.
    
    - It involves some judgement and mindfulness in picking the "canonical name" among the names used with a particular email. This is the name that will appear on thanks.rust-lang.org. Humans change their names sometimes and can be sensitive or picky about the use of names that are no longer preferred.
    
    For the purpose of this PR, I've tried to stick to the following heuristics which should be unobjectionable:
    
    - If one of the names is currently set as the display name on the contributor's GitHub profile, prefer that name.
    
    - If one of the names is used exclusively over the others in chronologically newer pull requests, prefer the newest name.
    
    - If one of the names has whitespace and the other doesn't (i.e. is username-like), such as `Foo Bar` vs `FooBar` or `foobar` or `foo-bar123`, but otherwise closely resemble one another, then prefer the human-like name.
    
    - If none of the above suffice in determining a canonical name and the contributor has some other name set on their GitHub profile, use the name from the GitHub profile.
    
    - If no name on their GitHub profile but the profile links to their personal website which unambiguously identifies their preferred name, then use that name.
    
    I'm also thinking about how to handle cases like Nick's, but that will be a project for a different PR. Basically I'd like to be able to find cases of the same person making commits that differ in name *and* email by looking at all the commits present in pull requests opened by the same GitHub user.
    
    <details>
    <summary>script</summary>
    
    ```toml
    [dependencies]
    anyhow = "1.0"
    git2 = "0.14"
    mailmap = "0.1"
    ```
    ```rust
    use anyhow::{bail, Context, Result};
    use git2::{Commit, Oid, Repository};
    use mailmap::{Author, Mailmap};
    use std::collections::{BTreeMap as Map, BTreeSet as Set};
    use std::fmt::{self, Debug};
    use std::fs;
    use std::path::Path;
    
    const REPO: &str = "/git/rust";
    
    fn main() -> Result<()> {
        let repo = Repository::open(REPO)?;
        let head_oid = repo
            .head()?
            .target()
            .context("expected head to be a direct reference")?;
        let head = repo.find_commit(head_oid)?;
    
        let mailmap_path = Path::new(REPO).join(".mailmap");
        let mailmap_contents = fs::read_to_string(mailmap_path)?;
        let mailmap = match Mailmap::from_string(mailmap_contents) {
            Ok(mailmap) => mailmap,
            Err(box_error) => bail!("{}", box_error),
        };
    
        let mut history = Set::new();
        let mut merges = Vec::new();
        let mut authors = Set::new();
        let mut emails = Map::new();
        let mut all_authors = Set::new();
        traverse_left(head, &mut history, &mut merges, &mut authors, &mailmap)?;
        while let Some((commit, i)) = merges.pop() {
            let right = commit.parents().nth(i).unwrap();
            authors.clear();
            traverse_left(right, &mut history, &mut merges, &mut authors, &mailmap)?;
            for author in &authors {
                all_authors.insert(author.clone());
                if !author.email.is_empty() {
                    emails
                        .entry(author.email.clone())
                        .or_insert_with(Map::new)
                        .entry(author.name.clone())
                        .or_insert_with(Set::new);
                }
            }
            if let Some(summary) = commit.summary() {
                if let Some(pr) = parse_summary(summary)? {
                    for author in &authors {
                        if !author.email.is_empty() {
                            emails
                                .get_mut(&author.email)
                                .unwrap()
                                .get_mut(&author.name)
                                .unwrap()
                                .insert(pr);
                        }
                    }
                }
            }
        }
    
        for (email, names) in emails {
            if names.len() > 1 {
                println!("<{}>", email);
                for (name, prs) in names {
                    let prs = DebugSet(prs.iter().rev());
                    println!("    {} {:?}", name, prs);
                }
            }
        }
    
        eprintln!("{} commits", history.len());
        eprintln!("{} authors", all_authors.len());
        Ok(())
    }
    
    fn traverse_left<'repo>(
        mut commit: Commit<'repo>,
        history: &mut Set<Oid>,
        merges: &mut Vec<(Commit<'repo>, usize)>,
        authors: &mut Set<Author>,
        mailmap: &Mailmap,
    ) -> Result<()> {
        loop {
            let oid = commit.id();
            if !history.insert(oid) {
                return Ok(());
            }
            let author = author(mailmap, &commit);
            let is_bors = author.name == "bors" && author.email == "bors@rust-lang.org";
            if !is_bors {
                authors.insert(author);
            }
            let mut parents = commit.parents();
            let parent = match parents.next() {
                Some(parent) => parent,
                None => return Ok(()),
            };
            for i in 1..1 + parents.len() {
                merges.push((commit.clone(), i));
            }
            commit = parent;
        }
    }
    
    fn parse_summary(summary: &str) -> Result<Option<PullRequest>> {
        let mut rest = None;
        for prefix in [
            "Auto merge of #",
            "Merge pull request #",
            " Manual merge of #",
            "auto merge of #",
            "auto merge of pull req #",
            "rollup merge of #",
            "Rollup merge of #",
            "Rollup merge of  #",
            "Rollup merge of ",
            "Merge PR #",
            "Merge #",
            "Merged #",
        ] {
            if summary.starts_with(prefix) {
                rest = Some(&summary[prefix.len()..]);
                break;
            }
        }
        let rest = match rest {
            Some(rest) => rest,
            None => return Ok(None),
        };
        let end = rest.find([' ', ':']).unwrap_or(rest.len());
        let number = match rest[..end].parse::<u32>() {
            Ok(number) => number,
            Err(err) => {
                eprintln!("{}", summary);
                bail!(err);
            }
        };
        Ok(Some(PullRequest(number)))
    }
    
    fn author(mailmap: &Mailmap, commit: &Commit) -> Author {
        let signature = commit.author();
        let name = String::from_utf8_lossy(signature.name_bytes()).into_owned();
        let email = String::from_utf8_lossy(signature.email_bytes()).into_owned();
        mailmap.canonicalize(&Author { name, email })
    }
    
    #[derive(Copy, Clone, Ord, PartialOrd, Eq, PartialEq)]
    struct PullRequest(u32);
    
    impl Debug for PullRequest {
        fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
            write!(formatter, "#{}", self.0)
        }
    }
    
    struct DebugSet<T>(T);
    
    impl<T> Debug for DebugSet<T>
    where
        T: Iterator + Clone,
        T::Item: Debug,
    {
        fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
            formatter.debug_set().entries(self.0.clone()).finish()
        }
    }
    ```
    </details>
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    a7a7eb0 View commit details
    Browse the repository at this point in the history
  4. Rollup merge of rust-lang#95705 - bstrie:x86nonetier, r=Mark-Simulacrum

    Promote x86_64-unknown-none target to Tier 2 and distribute build artifacts
    
    This implements rust-lang/compiler-team#499 , in which the compiler team accepted the x86_64-unknown-none target for promotion to a Tier 2 platform.
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    08ed863 View commit details
    Browse the repository at this point in the history
  5. Rollup merge of rust-lang#95751 - compiler-errors:ambig-int, r=jackh726

    Don't report numeric inference ambiguity when we have previous errors
    
    Fixes rust-lang#95648
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    feddbc5 View commit details
    Browse the repository at this point in the history
  6. Rollup merge of rust-lang#95761 - c410-f3r:meta-var-stuff, r=petroche…

    …nkov
    
    Kickstart the inner usage of `macro_metavar_expr`
    
    There can be more use-cases but I am out of ideas.
    
    cc rust-lang#83527
    r? `@petrochenkov`
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    b9b64b1 View commit details
    Browse the repository at this point in the history
  7. Rollup merge of rust-lang#95764 - c410-f3r:metavar-test, r=petrochenkov

    [macro_metavar_expr] Add tests to ensure the feature requirement
    
    These tests should have been added in the initial implementation they were unintentionally forgotten
    
    cc rust-lang#83527
    r? `@petrochenkov`
    Dylan-DPC authored Apr 8, 2022
    Configuration menu
    Copy the full SHA
    cfa8483 View commit details
    Browse the repository at this point in the history