Skip to content

Commit

Permalink
Merge pull request #9391 from Marcono1234/marcono1234/https-links
Browse files Browse the repository at this point in the history
Use HTTPS for links
  • Loading branch information
dwijnand committed Dec 21, 2020
2 parents 54eab98 + fabfdf7 commit 193169f
Show file tree
Hide file tree
Showing 145 changed files with 220 additions and 220 deletions.
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Expand Up @@ -16,7 +16,7 @@ By the way, the team at Lightbend is: @adriaanm, @lrytz, @retronym, @SethTisue,

## What kind of PR are you submitting?

Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala), to protect the OSS nature of the code base.
Regardless of the nature of your Pull Request, we have to ask you to digitally sign the [Scala CLA](https://www.lightbend.com/contribute/cla/scala), to protect the OSS nature of the code base.

You don't need to submit separate PRs for 2.12.x and 2.13.x. Any change accepted on 2.12.x will, in time, be merged onto 2.13.x too. (We are no longer accepting PRs for 2.11.x.)

Expand Down Expand Up @@ -48,7 +48,7 @@ For longer-running development, likely required for this category of code contri

Any language change (including bug fixes) must be accompanied by the relevant updates to the spec, which lives in the same repository for this reason.

A new language feature or other substantial enough language change requires a SIP (Scala Improvement Process) proposal. For more details on submitting SIPs, see [how to submit a SIP](http://docs.scala-lang.org/sips/sip-submission.html).
A new language feature or other substantial enough language change requires a SIP (Scala Improvement Process) proposal. For more details on submitting SIPs, see [how to submit a SIP](https://docs.scala-lang.org/sips/sip-submission.html).

## Guidelines

Expand Down Expand Up @@ -227,7 +227,7 @@ Follow the [Boy Scout Rule](https://martinfowler.com/bliki/OpportunisticRefactor
* "Always leave the code behind in a better state than you found it"
* This translates to using any opportunity possible to improve and clean up the code in front of you

Please also have a look at the [Scala Hacker Guide](http://www.scala-lang.org/contribute/hacker-guide.html) by @xeno-by.
Please also have a look at the [Scala Hacker Guide](https://www.scala-lang.org/contribute/hacker-guide.html) by @xeno-by.

### Clean commits, clean history

Expand Down Expand Up @@ -255,7 +255,7 @@ if this commit should not be merged forward into the next release
branch.

Here is standard advice on good commit messages:
http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

### Pass Scabot

Expand Down
10 changes: 5 additions & 5 deletions README.md
Expand Up @@ -13,7 +13,7 @@ To contribute here, please open a [pull request](https://help.github.com/article

Be aware that we can't accept additions to the standard library, only modifications to existing code. Binary compatibility forbids adding new public classes or public methods. Additions are made to [scala-library-next](https://github.com/scala/scala-library-next) instead.

We require that you sign the [Scala CLA](http://www.lightbend.com/contribute/cla/scala) before we can merge any of your work, to protect Scala's future as open source software.
We require that you sign the [Scala CLA](https://www.lightbend.com/contribute/cla/scala) before we can merge any of your work, to protect Scala's future as open source software.

The general workflow is as follows.
1. Find/file an issue in scala/bug (or submit a well-documented PR right away!).
Expand All @@ -28,7 +28,7 @@ For more information on building and developing the core of Scala, read the rest

In order to get in touch with other Scala contributors, join
[scala/contributors](https://gitter.im/scala/contributors) (Gitter) or post on
[contributors.scala-lang.org](http://contributors.scala-lang.org) (Discourse).
[contributors.scala-lang.org](https://contributors.scala-lang.org) (Discourse).

If you need some help with your PR at any time, please feel free to @-mention anyone from the list below, and we will do our best to help you out:

Expand Down Expand Up @@ -233,10 +233,10 @@ It contains useful information on our coding standards, testing, documentation,
we use git and GitHub and how to get your code reviewed.

You may also want to check out the following resources:
- The ["Scala Hacker Guide"](http://scala-lang.org/contribute/hacker-guide.html)
- The ["Scala Hacker Guide"](https://scala-lang.org/contribute/hacker-guide.html)
covers some of the same ground as this README, but in greater detail and in a more
tutorial style, using a running example.
- [Scala documentation site](http://docs.scala-lang.org)
- [Scala documentation site](https://docs.scala-lang.org)

# Scala CI

Expand Down Expand Up @@ -285,7 +285,7 @@ The Scala CI builds nightly download releases and publishes
them to https://scala-ci.typesafe.com/artifactory/scala-integration/ .

Using a nightly build in sbt is explained in
[this Stack Overflow answer](http://stackoverflow.com/questions/40622878)
[this Stack Overflow answer](https://stackoverflow.com/questions/40622878)

Although we casually refer to these as "nightly" builds, they aren't
actually built nightly, but "mergely". That is to say, a build is
Expand Down
2 changes: 1 addition & 1 deletion scripts/readproperties.awk
@@ -1,4 +1,4 @@
# Adapted from http://stackoverflow.com/questions/1682442/reading-java-properties-file-from-bash/2318840#2318840
# Adapted from https://stackoverflow.com/questions/1682442/reading-java-properties-file-from-bash/2318840#2318840
BEGIN {
FS="=";
n="";
Expand Down
2 changes: 1 addition & 1 deletion spec/05-classes-and-objects.md
Expand Up @@ -410,7 +410,7 @@ It is a static error if the inheritance closure of a class type
consists of an infinite number of types. (This restriction is
necessary to make subtyping decidable[^kennedy]).

[^kennedy]: Kennedy, Pierce. [On Decidability of Nominal Subtyping with Variance.]( http://research.microsoft.com/pubs/64041/fool2007.pdf) in FOOL 2007
[^kennedy]: Kennedy, Pierce. [On Decidability of Nominal Subtyping with Variance.]( https://research.microsoft.com/pubs/64041/fool2007.pdf) in FOOL 2007

### Early Definitions

Expand Down
2 changes: 1 addition & 1 deletion spec/11-annotations.md
Expand Up @@ -148,7 +148,7 @@ Java platform, the following annotations have a standard meaning.

Whenever the static type of an expression matches a specialized variant of
a definition, the compiler will instead use the specialized version.
See the [specialization sid](http://docs.scala-lang.org/sips/completed/scala-specialization.html) for more details of the implementation.
See the [specialization sid](https://docs.scala-lang.org/sips/completed/scala-specialization.html) for more details of the implementation.


## User-defined Annotations
Expand Down
12 changes: 6 additions & 6 deletions spec/14-references.md
Expand Up @@ -94,7 +94,7 @@ for syntactic definitions?",
organization = {EPFL},
month = feb,
year = 2007,
note = {http://www.scala-lang.org/docu/manuals.html}
note = {https://www.scala-lang.org/docu/manuals.html}
}
@Book{odersky:scala-reference,
Expand Down Expand Up @@ -125,7 +125,7 @@ for syntactic definitions?",
year = 2003,
month = jan,
note = {\hspace*{\fill}\\
\verb@http://www.cis.upenn.edu/~bcpierce/FOOL/FOOL10.html@}
\verb@https://www.cis.upenn.edu/~bcpierce/FOOL/FOOL10.html@}
}
%% Misc
Expand All @@ -135,14 +135,14 @@ for syntactic definitions?",
author = {W3C},
title = {Document Object Model ({DOM})},
howpublished = {\hspace*{\fill}\\
\verb@http://www.w3.org/DOM/@}
\verb@https://www.w3.org/DOM/@}
}
@Misc{w3c:xml,
author = {W3C},
title = {Extensible {M}arkup {L}anguage ({XML})},
howpublished = {\hspace*{\fill}\\
\verb@http://www.w3.org/TR/REC-xml@}
\verb@https://www.w3.org/TR/REC-xml@}
}
@TechReport{scala-overview-tech-report,
Expand Down Expand Up @@ -185,7 +185,7 @@ for syntactic definitions?",
booktitle = {Proc. FOOL 12},
year = 2005,
month = jan,
note = {\verb@http://homepages.inf.ed.ac.uk/wadler/fool@}
note = {\verb@https://homepages.inf.ed.ac.uk/wadler/fool@}
}
@InProceedings{odersky:scala-experiment,
Expand All @@ -201,7 +201,7 @@ for syntactic definitions?",
year = {2007},
month = jan,
note = {FOOL-WOOD '07},
short = {http://www.cis.upenn.edu/~bcpierce/papers/variance.pdf}
short = {https://www.cis.upenn.edu/~bcpierce/papers/variance.pdf}
}
-->
2 changes: 1 addition & 1 deletion spec/15-changelog.md
Expand Up @@ -639,7 +639,7 @@ The following three words are now reserved; they cannot be used as

#### Newlines as Statement Separators

[Newlines](http://www.scala-lang.org/files/archive/spec/2.11/)
[Newlines](https://www.scala-lang.org/files/archive/spec/2.11/)
can now be used as statement separators in place of semicolons.

#### Syntax Restrictions
Expand Down
2 changes: 1 addition & 1 deletion spec/README.md
Expand Up @@ -16,7 +16,7 @@ We aim to track the configuration GitHub Pages use but at times differences will

## Building

Travis CI builds the spec automatically after every merged pull release and publishes to http://www.scala-lang.org/files/archive/spec/2.13/.
Travis CI builds the spec automatically after every merged pull release and publishes to https://www.scala-lang.org/files/archive/spec/2.13/.

To preview locally, run the following commands in the root of your checkout scala/scala:
`bundle install` to install Jekyll and `bundle exec jekyll serve -d build/spec/ -s spec/ -w --baseurl=""` to start it,
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/reflect/reify/utils/Extractors.scala
Expand Up @@ -105,7 +105,7 @@ trait Extractors {
}

// if we're reifying a MethodType, we can't use it as a type argument for TypeTag ctor
// http://groups.google.com/group/scala-internals/browse_thread/thread/2d7bb85bfcdb2e2
// https://groups.google.com/group/scala-internals/browse_thread/thread/2d7bb85bfcdb2e2
private def mkTarg(tpe: Type): Tree = (
if ((tpe eq null) || !isUseableAsTypeArg(tpe)) TypeTree(AnyTpe)
else TypeTree(tpe)
Expand Down
10 changes: 5 additions & 5 deletions src/compiler/scala/tools/nsc/backend/jvm/BCodeBodyBuilder.scala
Expand Up @@ -25,7 +25,7 @@ import scala.tools.nsc.backend.jvm.GenBCode._

/*
*
* @author Miguel Garcia, http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
* @author Miguel Garcia, https://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
*
*/
abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
Expand Down Expand Up @@ -667,7 +667,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
//
// Note that using `Object.clone()` would work as well, but only because the JVM
// relaxes protected access specifically if the receiver is an array:
// http://hg.openjdk.java.net/jdk8/jdk8/hotspot/file/87ee5ee27509/src/share/vm/interpreter/linkResolver.cpp#l439
// https://hg.openjdk.java.net/jdk8/jdk8/hotspot/file/87ee5ee27509/src/share/vm/interpreter/linkResolver.cpp#l439
// Example: `class C { override def clone(): Object = "hi" }`
// Emitting `def f(c: C) = c.clone()` as `Object.clone()` gives a VerifyError.
val target: String = tpeTK(qual).asRefBType.classOrArrayType
Expand Down Expand Up @@ -824,15 +824,15 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
* Note: The two verifiers (old: type inference, new: type checking) have different
* requirements. Very briefly:
*
* Old (http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.10.2.1): at
* Old (https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.10.2.1): at
* each program point, no matter what branches were taken to get there
* - Stack is same size and has same typed values
* - Local and stack values need to have consistent types
* - In practice, the old verifier seems to ignore unreachable code and accept any
* instructions after an ATHROW. For example, there can be another ATHROW (without
* loading another throwable first).
*
* New (http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.10.1)
* New (https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.10.1)
* - Requires consistent stack map frames. GenBCode always generates stack frames.
* - In practice: the ASM library computes stack map frames for us (ClassWriter). Emitting
* correct frames after an ATHROW is probably complex, so ASM uses the following strategy:
Expand Down Expand Up @@ -1007,7 +1007,7 @@ abstract class BCodeBodyBuilder extends BCodeSkelBuilder {
// could add some guess based on types of primitive args.
// or, we could stringify all the args onto the stack, compute the exact size of
// the StringBuilder.
// or, just let http://openjdk.java.net/jeps/280 (or a re-implementation thereof in our 2.13.x stdlib) do all the hard work at link time
// or, just let https://openjdk.java.net/jeps/280 (or a re-implementation thereof in our 2.13.x stdlib) do all the hard work at link time
0
}.sum
bc.genStartConcat(tree.pos, approxBuilderSize)
Expand Down
8 changes: 4 additions & 4 deletions src/compiler/scala/tools/nsc/backend/jvm/BCodeHelpers.scala
Expand Up @@ -26,7 +26,7 @@ import scala.tools.nsc.Reporting.WarningCategory
/*
* Traits encapsulating functionality to convert Scala AST Trees into ASM ClassNodes.
*
* @author Miguel Garcia, http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
* @author Miguel Garcia, https://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
*
*/
abstract class BCodeHelpers extends BCodeIdiomatic {
Expand Down Expand Up @@ -355,8 +355,8 @@ abstract class BCodeHelpers extends BCodeIdiomatic {
* Custom attribute (JVMS 4.7.1) "ScalaSig" used as marker only
* i.e., the pickle is contained in a custom annotation, see:
* (1) `addAnnotations()`,
* (2) SID # 10 (draft) - Storage of pickled Scala signatures in class files, http://www.scala-lang.org/sid/10
* (3) SID # 5 - Internals of Scala Annotations, http://www.scala-lang.org/sid/5
* (2) SID # 10 (draft) - Storage of pickled Scala signatures in class files, https://www.scala-lang.org/sid/10
* (3) SID # 5 - Internals of Scala Annotations, https://www.scala-lang.org/sid/5
* That annotation in turn is not related to the "java-generic-signature" (JVMS 4.7.9)
* other than both ending up encoded as attributes (JVMS 4.7)
* (with the caveat that the "ScalaSig" attribute is associated to some classes,
Expand Down Expand Up @@ -1010,7 +1010,7 @@ object BCodeHelpers {

/**
* Valid flags for InnerClass attribute entry.
* See http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6
* See https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.6
*/
val INNER_CLASSES_FLAGS = {
asm.Opcodes.ACC_PUBLIC | asm.Opcodes.ACC_PRIVATE | asm.Opcodes.ACC_PROTECTED |
Expand Down
Expand Up @@ -23,7 +23,7 @@ import scala.tools.nsc.backend.jvm.GenBCode._
/*
* A high-level facade to the ASM API for bytecode generation.
*
* @author Miguel Garcia, http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
* @author Miguel Garcia, https://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
*
*/
abstract class BCodeIdiomatic {
Expand Down
Expand Up @@ -21,7 +21,7 @@ import GenBCode._
import BackendReporting._

/*
* @author Miguel Garcia, http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
* @author Miguel Garcia, https://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
*/
abstract class BCodeSkelBuilder extends BCodeHelpers {
import global._
Expand Down
Expand Up @@ -20,7 +20,7 @@ import scala.tools.asm

/*
*
* @author Miguel Garcia, http://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
* @author Miguel Garcia, https://lampwww.epfl.ch/~magarcia/ScalaCompilerCornerReloaded/
*
*/
abstract class BCodeSyncAndTry extends BCodeBodyBuilder {
Expand Down
6 changes: 3 additions & 3 deletions src/compiler/scala/tools/nsc/backend/jvm/BTypes.scala
Expand Up @@ -335,8 +335,8 @@ abstract class BTypes {
*
* In this summary, "class" means "class or interface".
*
* JLS: http://docs.oracle.com/javase/specs/jls/se8/html/index.html
* JVMS: http://docs.oracle.com/javase/specs/jvms/se8/html/index.html
* JLS: https://docs.oracle.com/javase/specs/jls/se8/html/index.html
* JVMS: https://docs.oracle.com/javase/specs/jvms/se8/html/index.html
*
* Terminology
* -----------
Expand Down Expand Up @@ -721,7 +721,7 @@ abstract class BTypes {
/**
* Finding the least upper bound in agreement with the bytecode verifier
* Background:
* http://gallium.inria.fr/~xleroy/publi/bytecode-verification-JAR.pdf
* https://xavierleroy.org/publi/bytecode-verification-JAR.pdf
* http://comments.gmane.org/gmane.comp.java.vm.languages/2293
* https://github.com/scala/bug/issues/3872#issuecomment-292386375
*/
Expand Down
Expand Up @@ -701,7 +701,7 @@ abstract class BTypesFromSymbols[G <: Global](val global: G) extends BTypes {
// TODO: give nested objects the ACC_FINAL flag again, since we won't let them be overridden
//
// For fields, only eager val fields can receive ACC_FINAL. vars or lazy vals can't:
// Source: http://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.5.3
// Source: https://docs.oracle.com/javase/specs/jls/se7/html/jls-17.html#jls-17.5.3
// "Another problem is that the specification allows aggressive
// optimization of final fields. Within a thread, it is permissible to
// reorder reads of a final field with those modifications of a final
Expand Down
Expand Up @@ -709,7 +709,7 @@ object BackendUtils {
*
* However, the JVM spec does not require subroutines to `RET x` to their caller, they could return back to an
* outer subroutine caller (nested subroutines), or `RETURN`, or use a static jump. Static analysis of subroutines
* is therefore complex (http://www21.in.tum.de/~kleing/papers/KleinW-TPHOLS03.pdf).
* is therefore complex (https://www21.in.tum.de/~kleing/papers/KleinW-TPHOLS03.pdf).
*
* The asm.Analyzer however makes the assumption that subroutines only occur in the shape emitted by early
* javac, i.e., `RET` always returns to the next enclosing caller. So we do that as well.
Expand Down
Expand Up @@ -291,7 +291,7 @@ abstract class ByteCodeRepository extends PerRunInit {
// TODO: we need to remove them also for classes that are not parsed from classfiles, why not simplify and do it once when inlining?
// OR: instead of skipping line numbers for inlined code, use write a SourceDebugExtension
// attribute that contains JSR-45 data that encodes debugging info.
// http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.11
// https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.7.11
// https://jcp.org/aboutJava/communityprocess/final/jsr045/index.html
removeLineNumbersAndAddLMFImplMethods(classNode)
classNode
Expand Down
Expand Up @@ -28,7 +28,7 @@ import scala.tools.nsc.backend.jvm.analysis.InstructionStackEffect

object BytecodeUtils {

// http://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.9.1
// https://docs.oracle.com/javase/specs/jvms/se7/html/jvms-4.html#jvms-4.9.1
final val maxJVMMethodSize = 65535

// 5% margin, more than enough for the instructions added by the inliner (store / load args, null check for instance methods)
Expand Down
8 changes: 4 additions & 4 deletions src/compiler/scala/tools/nsc/backend/jvm/opt/Inliner.scala
Expand Up @@ -1277,10 +1277,10 @@ abstract class Inliner {
// - the receiver is the target of the CallSite
// - the other argument values are those that were on the operand stack at the indy instruction (indyLambda: the captured values)
//
// [1] http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10
// [2] http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23
// [3] http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokedynamic
// [4] http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-5.html#jvms-5.4.3
// [1] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.4.10
// [2] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23
// [3] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-6.html#jvms-6.5.invokedynamic
// [4] https://docs.oracle.com/javase/specs/jvms/se8/html/jvms-5.html#jvms-5.4.3

// We cannot generically check if an `invokedynamic` instruction can be safely inlined into
// a different class, that depends on the bootstrap method. The Lookup object passed to the
Expand Down
Expand Up @@ -284,7 +284,7 @@ abstract class InlinerHeuristics extends PerRunInit {
}

/*
// using http://lihaoyi.github.io/Ammonite/
// using https://lihaoyi.github.io/Ammonite/
load.ivy("com.google.guava" % "guava" % "18.0")
val javaUtilFunctionClasses = {
Expand Down

0 comments on commit 193169f

Please sign in to comment.