Fix duplicate import removal for imports_granularity="Module"#6677

Manishearth merged 2 commits intorust-lang:masterrust-lang/rustfmt:masterfrom

tqwewe:fix-import-granularity-deduptqwewe/rustfmt:fix-import-granularity-dedupCopy head branch name to clipboard