diff options
| author | Maxime Dénès | 2016-06-29 11:48:49 +0200 |
|---|---|---|
| committer | Maxime Dénès | 2016-06-29 11:48:49 +0200 |
| commit | 58b6784fee71a16719bc4f268dc42830c06a5c63 (patch) | |
| tree | a9a3859746d2ff97f8c0b8106c96b49f9122a1b7 /library/loadpath.ml | |
| parent | 0e07e69dae3f3f4a99f824533f54a3991aacac6a (diff) | |
| parent | dd8d2a1d017d20635f943af205dcb0127a992a59 (diff) | |
Merge branch 'warnings' into trunk
Was PR#213: New warnings machinery
Diffstat (limited to 'library/loadpath.ml')
| -rw-r--r-- | library/loadpath.ml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/library/loadpath.ml b/library/loadpath.ml index 33c0f41e17..6f4d79430d 100644 --- a/library/loadpath.ml +++ b/library/loadpath.ml @@ -50,6 +50,13 @@ let remove_load_path dir = let filter p = not (String.equal p.path_physical dir) in load_paths := List.filter filter !load_paths +let warn_overriding_logical_loadpath = + CWarnings.create ~name:"overriding-logical-loadpath" ~category:"loadpath" + (fun (phys_path, old_path, coq_path) -> + str phys_path ++ strbrk " was previously bound to " ++ + pr_dirpath old_path ++ strbrk "; it is remapped to " ++ + pr_dirpath coq_path) + let add_load_path phys_path coq_path ~implicit = let phys_path = CUnix.canonical_path_name phys_path in let filter p = String.equal p.path_physical phys_path in @@ -72,10 +79,8 @@ let add_load_path phys_path coq_path ~implicit = let () = (* Do not warn when overriding the default "-I ." path *) if not (DirPath.equal old_path Nameops.default_root_prefix) then - Feedback.msg_warning - (str phys_path ++ strbrk " was previously bound to " ++ - pr_dirpath old_path ++ strbrk "; it is remapped to " ++ - pr_dirpath coq_path) in + warn_overriding_logical_loadpath (phys_path, old_path, coq_path) + in true in if replace then begin |