[Extlib] removed xor

bin/migration_scripts/manganese2iron.sh

@@ -86,7 +86,8 @@ process_file ()
   fi
   sedi "$file" \
    -e 's/Extlib\.id/Fun.id/g' \
-   -e 's/Extlib\.swap/Fun.flip/g'
+   -e 's/Extlib\.swap/Fun.flip/g' \
+   -e 's/Extlib\.xor/(<>)/g'
    # this line left empty on purpose
 }
 

src/kernel_internals/typing/mergecil.ml

@@ -2671,7 +2671,7 @@ let oneFilePass2 (f: file) =
             visit vi';
             vi'.vaddrof <- vi.vaddrof || vi'.vaddrof;
             vi'.vdefined <- vi.vdefined || vi'.vdefined;
-            if Extlib.xor vi'.vghost vi.vghost then
+            if vi'.vghost <> vi.vghost then
               Kernel.abort
                 "Cannot merge: Global %a has both ghost and non-ghost status"
                 Cil_printer.pp_varinfo vi';

src/libraries/stdlib/extlib.ml

@@ -242,12 +242,6 @@ let opt_map2 f x y = match x, y with
   | None, _ | _, None -> None
   | Some x, Some y -> Some (f x y)
 
-(* ************************************************************************* *)
-(** Booleans                                                                 *)
-(* ************************************************************************* *)
-
-let xor x y = if x then not y else y
-
 (* ************************************************************************* *)
 (** {2 Performance} *)
 (* ************************************************************************* *)

src/libraries/stdlib/extlib.mli

@@ -207,14 +207,6 @@ val opt_map2: ('a -> 'b -> 'c) -> 'a option -> 'b option -> 'c option
     [None].
     @since 24.0-Chromium *)
 
-(* ************************************************************************* *)
-(** {2 Booleans} *)
-(* ************************************************************************* *)
-
-val xor: bool -> bool -> bool
-(** exclusive-or.
-    @since Oxygen-20120901 *)
-
 (* ************************************************************************* *)
 (** {2 Strings} *)
 (* ************************************************************************* *)