Skip to content

Fix break after Psig_include depending on presence of docstring#1125

Merged
gpetiot merged 3 commits intoocaml-ppx:masterfrom
gpetiot:fix-break-after-sig-include
Nov 5, 2019
Merged

Fix break after Psig_include depending on presence of docstring#1125
gpetiot merged 3 commits intoocaml-ppx:masterfrom
gpetiot:fix-break-after-sig-include

Conversation

@gpetiot
Copy link
Copy Markdown
Collaborator

@gpetiot gpetiot commented Nov 5, 2019 •
edited
Loading

Fix #1114

diff with test_branch.sh:

diff --git a/infer/src/concurrency/ExplicitTrace.mli b/infer/src/concurrency/ExplicitTrace.mli
index 1a7b85dd9..c7ce25521 100644
--- a/infer/src/concurrency/ExplicitTrace.mli
+++ b/infer/src/concurrency/ExplicitTrace.mli
@@ -33,8 +33,7 @@ module type TraceElem = sig
   type t = private {elem: elem_t; loc: Location.t; trace: CallSite.t list}
   (** An [elem] which occured at [loc], after the chain of steps (usually calls) in [trace]. *)
 
-  include
-    Element with type t := t
+  include Element with type t := t
   (** Both [pp] and [describe] simply call the same function on the trace element. *)

and for the janestreet profile:

diff --git a/infer/src/biabduction/BuiltinDefn.mli b/infer/src/biabduction/BuiltinDefn.mli
index 193dd0593..7917f6104 100644
--- a/infer/src/biabduction/BuiltinDefn.mli
+++ b/infer/src/biabduction/BuiltinDefn.mli
@@ -8,8 +8,7 @@
 open! IStd
 
 (** Models for the builtin functions supported *)
-include
-  BUILTINS.S with type t = Builtin.registered
+include BUILTINS.S with type t = Builtin.registered

@gpetiot gpetiot requested a review from Julow November 5, 2019 08:30
jberdine
jberdine approved these changes Nov 5, 2019
View reviewed changes
Copy link
Copy Markdown
Collaborator

@jberdine jberdine left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@gpetiot gpetiot merged commit 177c823 into ocaml-ppx:master Nov 5, 2019
@gpetiot gpetiot deleted the fix-break-after-sig-include branch November 5, 2019 15:03
@Julow Julow mentioned this pull request Jan 28, 2020
Merged
Julow added a commit to Julow/opam-repository that referenced this pull request Jan 28, 2020
@Julow
[new release] ocamlformat (0.13.0)
0363fa8 
CHANGES:

#### New features

  + Add an option `--margin-check` to emit a warning if the formatted output exceeds the margin (ocaml-ppx/ocamlformat#1110) (Guillaume Petiot)
  + Preserve comment indentation when `wrap-comments` is unset (ocaml-ppx/ocamlformat#1138, ocaml-ppx/ocamlformat#1159) (Jules Aguillon)
  + Improve error messages (ocaml-ppx/ocamlformat#1147) (Jules Aguillon)
  + Display standard output in the emacs plugin even when ocamlformat does not fail (ocaml-ppx/ocamlformat#1189) (Guillaume Petiot)

#### Removed

  + Remove `ocamlformat_reason` (ocaml-ppx/ocamlformat#254, ocaml-ppx/ocamlformat#1185) (Etienne Millon).
    This tool has never been released to opam, has no known users, and overlaps
    with what `refmt` can do.
  + Remove `ocamlformat-diff` (ocaml-ppx/ocamlformat#1205) (Guillaume Petiot)
    This tool has never been released to opam, has no known users, and overlaps
    with what `merge-fmt` can do.

#### Packaging

  + Work with base v0.13.0 (ocaml-ppx/ocamlformat#1163) (Jules Aguillon)

#### Bug fixes

  + Fix placement of comments just before a '|' (ocaml-ppx/ocamlformat#1203) (Jules Aguillon)
  + Fix build version detection when building in the absence of a git root (ocaml-ppx/ocamlformat#1198) (Anil Madhavapeddy)
  + Fix wrapping of or-patterns in presence of comments with `break-cases=fit` (ocaml-ppx/ocamlformat#1167) (Jules Aguillon)
    This also fixes an unstable comment bug in or-patterns
  + Fix an unstable comment bug in variant declarations (ocaml-ppx/ocamlformat#1108) (Jules Aguillon)
  + Fix: break multiline comments (ocaml-ppx/ocamlformat#1122) (Guillaume Petiot)
  + Fix: types on named arguments were wrapped incorrectly when preceding comments (ocaml-ppx/ocamlformat#1124) (Guillaume Petiot)
  + Fix the indentation produced by max-indent (ocaml-ppx/ocamlformat#1118) (Guillaume Petiot)
  + Fix break after Psig_include depending on presence of docstring (ocaml-ppx/ocamlformat#1125) (Guillaume Petiot)
  + Remove some calls to if_newline and break_unless_newline and fix break before closing brackets (ocaml-ppx/ocamlformat#1168) (Guillaume Petiot)
  + Fix unstable cmt in or-pattern (ocaml-ppx/ocamlformat#1173) (Guillaume Petiot)
  + Fix location of comment attached to the underscore of an open record (ocaml-ppx/ocamlformat#1208) (Guillaume Petiot)
  + Fix parentheses around optional module parameter (ocaml-ppx/ocamlformat#1212) (Christian Barcenas)
  + Fix grouping of horizontally aligned comments (ocaml-ppx/ocamlformat#1209) (Guillaume Petiot)
  + Fix dropped comments around module pack expressions (ocaml-ppx/ocamlformat#1214) (Jules Aguillon)
  + Fix regression of comment position in list patterns (ocaml-ppx/ocamlformat#1141) (Josh Berdine)
  + Fix: adjust definition of Location.is_single_line to reflect margin (ocaml-ppx/ocamlformat#1102) (Josh Berdine)

#### Documentation

  + Fix documentation of option `version-check` (ocaml-ppx/ocamlformat#1135) (Wilfred Hughes)
  + Fix hint when using `break-separators=after-and-docked` (ocaml-ppx/ocamlformat#1130) (Greta Yorsh)
bogdan2412 pushed a commit to bogdan2412/ocamlformat that referenced this pull request Mar 28, 2020
@gpetiot @bogdan2412
Fix break after Psig_include depending on presence of docstring (ocam…
60d8442 
…l-ppx#1125)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jberdine jberdine jberdine approved these changes

@Julow Julow Awaiting requested review from Julow

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Bug: break after Psig_include depending on presence of docstring

3 participants

@gpetiot @jberdine @facebook-github-bot