From 52b30bcd4c1bb46879075f3a77d6eb3df3688c3a Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Mon, 27 Mar 2017 19:15:36 -0400 Subject: verify classpath feature to identify duplicate classes --- libraries/file/file.scala | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libraries/file') diff --git a/libraries/file/file.scala b/libraries/file/file.scala index 900e9ec..d420964 100644 --- a/libraries/file/file.scala +++ b/libraries/file/file.scala @@ -79,14 +79,14 @@ trait Module { case v @ ( file, _ ) if collector.isDefinedAt( v ) => file -> collector( v ) } if ( !allowDuplicates ) { - val relatives = map.unzip._2 - val duplicateFiles = ( relatives diff relatives.distinct ).distinct + val duplicates = map.groupBy( _._2 ).filter( _._2.size > 1 ).mapValues( _.map( _._1 ).toSeq.sorted ).toSeq.sortBy( _._1 ) assert( - duplicateFiles.isEmpty, { - val rs = relatives.toSet + duplicates.isEmpty, + { "Conflicting:\n\n" + - map.filter( rs contains _._2 ).groupBy( _._2 ).mapValues( _.map( _._1 ).sorted ).toSeq.sortBy( _._1 ).map { - case ( name, files ) => s"$name:\n" ++ files.mkString( "\n" ) + duplicates.map { + case ( path, locations ) => + path + " in:\n" + locations.mkString( "\n" ) }.mkString( "\n\n" ) } ) -- cgit v1.2.3