Skip to content

Commit 7480cd8

Browse files
committed
Revert "[DOC] Remove unnecessary require" [ci skip]
This reverts commit bf01f6a, that was an accidental commit by mistake.
1 parent f315ca6 commit 7480cd8

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ d1474affa8e105bece209cc9d594bb0a989859e1
1414

1515
# Indentation
1616
0e4bad888e605d424b9222ae0ca43f85c1634e5e
17+
61aa46c41648c6d1e9b0daa1a292de551fde78df
1718

1819
# Enable Style/StringLiterals cop for RubyGems/Bundler
1920
d7ffd3fea402239b16833cc434404a7af82d44f3
@@ -42,6 +43,7 @@ d4e24021d39e1f80f0055b55d91f8d5f22e15084
4243
e90282be7ba1bc8e3119f6e1a2c80356ceb3f80a
4344
26a9e0b4e31f7b5a9cbd755e0a15823a8fa51bae
4445
2f53985da9ee593fe524d408256835667938c7d7
46+
bf01f6ae89a95d8f5572e050facfe311c8c28aaf
4547

4648
# Win32: EOL code of batch files
4749
23f9a0d655c4d405bb2397a147a1523436205486

string.c

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11122,48 +11122,48 @@ rb_str_justify(int argc, VALUE *argv, VALUE str, char jflag)
1112211122
rlen = n - llen;
1112311123
cr = ENC_CODERANGE(str);
1112411124
if (flen > 1) {
11125-
llen2 = str_offset(f, f + flen, llen % fclen, enc, singlebyte);
11126-
rlen2 = str_offset(f, f + flen, rlen % fclen, enc, singlebyte);
11125+
llen2 = str_offset(f, f + flen, llen % fclen, enc, singlebyte);
11126+
rlen2 = str_offset(f, f + flen, rlen % fclen, enc, singlebyte);
1112711127
}
1112811128
size = RSTRING_LEN(str);
1112911129
if ((len = llen / fclen + rlen / fclen) >= LONG_MAX / flen ||
11130-
(len *= flen) >= LONG_MAX - llen2 - rlen2 ||
11131-
(len += llen2 + rlen2) >= LONG_MAX - size) {
11132-
rb_raise(rb_eArgError, "argument too big");
11130+
(len *= flen) >= LONG_MAX - llen2 - rlen2 ||
11131+
(len += llen2 + rlen2) >= LONG_MAX - size) {
11132+
rb_raise(rb_eArgError, "argument too big");
1113311133
}
1113411134
len += size;
1113511135
res = str_enc_new(rb_cString, 0, len, enc);
1113611136
p = RSTRING_PTR(res);
1113711137
if (flen <= 1) {
11138-
memset(p, *f, llen);
11139-
p += llen;
11138+
memset(p, *f, llen);
11139+
p += llen;
1114011140
}
1114111141
else {
11142-
while (llen >= fclen) {
11142+
while (llen >= fclen) {
1114311143
memcpy(p,f,flen);
1114411144
p += flen;
1114511145
llen -= fclen;
1114611146
}
11147-
if (llen > 0) {
11148-
memcpy(p, f, llen2);
11149-
p += llen2;
11147+
if (llen > 0) {
11148+
memcpy(p, f, llen2);
11149+
p += llen2;
1115011150
}
1115111151
}
1115211152
memcpy(p, RSTRING_PTR(str), size);
1115311153
p += size;
1115411154
if (flen <= 1) {
11155-
memset(p, *f, rlen);
11156-
p += rlen;
11155+
memset(p, *f, rlen);
11156+
p += rlen;
1115711157
}
1115811158
else {
11159-
while (rlen >= fclen) {
11159+
while (rlen >= fclen) {
1116011160
memcpy(p,f,flen);
1116111161
p += flen;
1116211162
rlen -= fclen;
1116311163
}
11164-
if (rlen > 0) {
11165-
memcpy(p, f, rlen2);
11166-
p += rlen2;
11164+
if (rlen > 0) {
11165+
memcpy(p, f, rlen2);
11166+
p += rlen2;
1116711167
}
1116811168
}
1116911169
TERM_FILL(p, termlen);

0 commit comments

Comments
 (0)