diff options
| author | Lemmih <lemmih@gmail.com> | 2006-02-24 21:27:48 +0000 |
|---|---|---|
| committer | Lemmih <lemmih@gmail.com> | 2006-02-24 21:27:48 +0000 |
| commit | 0082601b41a99d8916e33a60453af2c60e08e6d0 (patch) | |
| tree | ec9a15dae7684fafb33d9257b2aa63aa79e72932 | |
| parent | eb02a91c16d62d83891cd77f1db089cb2c3706d5 (diff) | |
| download | haskell-0082601b41a99d8916e33a60453af2c60e08e6d0.tar.gz | |
Remove duplicate code from RnNames.
| -rw-r--r-- | ghc/compiler/rename/RnNames.lhs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs index a3db173a6f..7addc99458 100644 --- a/ghc/compiler/rename/RnNames.lhs +++ b/ghc/compiler/rename/RnNames.lhs @@ -205,15 +205,6 @@ importsFromImportDeclDirect this_mod (L loc importDecl@(ImportDecl loc_imp_mod_name want_boot qual_only as_mod imp_details)) = setSrcSpan loc $ do iface <- loadSrcInterface doc imp_mod_name want_boot - -- Compiler sanity check: if the import didn't say - -- {-# SOURCE #-} we should not get a hi-boot file - WARN( not want_boot && mi_boot iface, ppr imp_mod_name ) $ do - -- Issue a user warning for a redundant {- SOURCE -} import - -- NB that we arrange to read all the ordinary imports before - -- any of the {- SOURCE -} imports - warnIf (want_boot && not (mi_boot iface)) - (warnRedundantSourceImport imp_mod_name) - let filtered_exports = filter not_this_mod (mi_exports iface) not_this_mod (mod,_) = mod /= this_mod @@ -241,7 +232,7 @@ importsFromImportDeclDirect this_mod is_dloc = loc, is_as = qual_mod_name } -- Get the total imports, and filter them according to the import list - total_avails <- ifaceExportNames filtered_exports + total_avails <- ifaceExportNames (mi_exports iface) importDecl' <- rnImportDecl iface imp_spec importDecl total_avails return (L loc importDecl') where imp_mod_name = unLoc loc_imp_mod_name |